Merge branch 'master' into zfs

10 files changed, 341 insertions, 87 deletions

diff --git a/legacy/corindon-red/APKBUILD b/legacy/corindon-red/APKBUILD
new file mode 100644
index 000000000..0cd8da56a
--- /dev/null
+++ b/legacy/corindon-red/APKBUILD
@@ -0,0 +1,20 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=corindon-red
+pkgver=1.0
+pkgrel=0
+pkgdesc="Corindon theme for Aurorae (Red)"
+url="https://store.kde.org/p/1002602/"
+arch="noarch"
+license="GPL-2.0+"
+options="!check"  # No test suite.
+depends=""
+makedepends=""
+source="https://dl.opendesktop.org/api/files/downloadfile/id/1460740699/s/90b6b780028e72203f2a0fba41edf43a/t/1520219138/u//122445-corindon-red.tar.gz"
+
+package() {
+	mkdir -p "$pkgdir"/usr/share/aurorae/themes
+	mv "$srcdir"/corindon-red "$pkgdir"/usr/share/aurorae/themes/
+}
+
+sha512sums="9be72e3404eac6c7f0093038b1f873064883ed62ab81486133ef1d9ce50a9ede43d68ed61ebc3280289433abf8a794ca6591c906f51636dec5c1fa197626a630  122445-corindon-red.tar.gz"
diff --git a/legacy/digikam/APKBUILD b/legacy/digikam/APKBUILD
deleted file mode 100644
index 3cdf9c377..000000000
--- a/legacy/digikam/APKBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Contributor: A. Wilcox <awilfox@adelielinux.org>
-# Maintainer: A. Wilcox <awilfox@adelielinux.org>
-pkgname=digikam
-pkgver=5.9.0
-pkgrel=0
-pkgdesc="Professional photo management and digital camera import"
-url="https://www.digikam.org/"
-arch="all"
-options="!check"  # Test suite doesn't support our version of Boost
-license="GPL-2.0-only"
-depends=""
-makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtxmlpatterns-dev
-	qt5-qtsvg-dev kconfig-dev kwindowsystem-dev kxmlgui-dev ki18n-dev
-	karchive-dev kio-dev qt5-qtwebkit-dev kcoreaddons-dev kservice-dev
-	solid-dev kiconthemes-dev kfilemetadata-dev threadweaver-dev libpng-dev
-	knotifyconfig-dev knotifications-dev akonadi-contacts-dev kcalcore-dev
-	libjpeg-turbo-dev tiff-dev zlib-dev boost-dev lcms2-dev expat-dev
-	exiv2-dev flex bison libxml2-dev libxslt-dev eigen-dev libgphoto2-dev
-	libksane-dev libkipi-dev glu-dev qt5-qtx11extras-dev jasper-dev
-	opencv opencv-dev"
-# YES, both are needed. opencv-dev only pulls in -libs; CMake module in opencv
-subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/digikam/digikam-$pkgver.tar.xz"
-
-build() {
-	cd "$builddir"
-	if [ "$CBUILD" != "$CHOST" ]; then
-		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
-	fi
-	cmake \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=lib \
-		-DBUILD_SHARED_LIBS=True \
-		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DENABLE_APPSTYLES=ON \
-		-DENABLE_MYSQLSUPPORT=OFF \
-		-DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \
-		-DENABLE_OPENCV3=ON \
-		-DBUILD_TESTING=OFF \
-		${CMAKE_CROSSOPTS}
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63  digikam-5.9.0.tar.xz"
diff --git a/legacy/digikam/digikam6.patch b/legacy/digikam/digikam6.patch
deleted file mode 100644
index 58c0f0d28..000000000
--- a/legacy/digikam/digikam6.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/user/digikam/APKBUILD b/user/digikam/APKBUILD
-index 3cdf9c37..bfffed9f 100644
---- a/user/digikam/APKBUILD
-+++ b/user/digikam/APKBUILD
-@@ -1,7 +1,7 @@
- # Contributor: A. Wilcox <awilfox@adelielinux.org>
- # Maintainer: A. Wilcox <awilfox@adelielinux.org>
- pkgname=digikam
--pkgver=5.9.0
-+pkgver=6.0.0
- pkgrel=0
- pkgdesc="Professional photo management and digital camera import"
- url="https://www.digikam.org/"
-@@ -20,7 +20,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtxmlpatterns-dev
- 	opencv opencv-dev"
- # YES, both are needed. opencv-dev only pulls in -libs; CMake module in opencv
- subpackages="$pkgname-doc $pkgname-lang"
--source="https://download.kde.org/stable/digikam/digikam-$pkgver.tar.xz"
-+source="https://download.kde.org/stable/digikam/$pkgver/digikam-$pkgver.tar.xz"
- 
- build() {
- 	cd "$builddir"
-@@ -37,7 +37,6 @@ build() {
- 		-DENABLE_APPSTYLES=ON \
- 		-DENABLE_MYSQLSUPPORT=OFF \
- 		-DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \
--		-DENABLE_OPENCV3=ON \
- 		-DBUILD_TESTING=OFF \
- 		${CMAKE_CROSSOPTS}
- 	make
-@@ -48,4 +47,4 @@ package() {
- 	make DESTDIR="$pkgdir" install
- }
- 
--sha512sums="f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63  digikam-5.9.0.tar.xz"
-+sha512sums="b8a70dde0b3838c4ccaffa3324eacb0541642e82177c90a1f8fcbd9691c194369f2760c4ea56c58b7ae049fc1a748d5d88cb537c62e3700ed5e21bad44d01adb  digikam-6.0.0.tar.xz"
diff --git a/legacy/dmenu/APKBUILD b/legacy/dmenu/APKBUILD
new file mode 100644
index 000000000..36c844132
--- /dev/null
+++ b/legacy/dmenu/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: Eivind Uggedal <eivind@uggedal.com>
+# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
+# Maintainer: Dan Theisen <djt@hxx.in>
+pkgname=dmenu
+pkgver=4.9
+pkgrel=0
+pkgdesc="Dynamic menu for X"
+url="https://tools.suckless.org/dmenu/"
+arch="all"
+options="!check"  # This package has no testsuite
+license="MIT OR X11"
+depends=""
+makedepends="libx11-dev libxinerama-dev libxft-dev"
+subpackages="$pkgname-doc"
+source="https://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz"
+
+prepare() {
+	default_prepare
+	sed -i -e '/CFLAGS/{s/-Os//;s/=/+=/}' \
+		-e '/LDFLAGS/{s/-s//;s/=/+=/}' \
+		"$builddir"/config.mk
+}
+
+build() {
+	make X11INC=/usr/include/X11 \
+		X11LIB=/usr/lib/X11 \
+		FREETYPEINC=/usr/include/freetype2 \
+		-C "$builddir"
+}
+
+package() {
+	make DESTDIR=$pkgdir PREFIX=/usr \
+		-C "$builddir" install
+}
+
+sha512sums="c2779209fe012de8ca1cdd72923da6d594f4a8368c85c3c0e0afd4ae489a95fe0e6f05a947d115b6b389aa7170ab14c2c645a2031353b0a08f38327ab461fe65  dmenu-4.9.tar.gz"
diff --git a/legacy/lbxproxy/APKBUILD b/legacy/lbxproxy/APKBUILD
new file mode 100644
index 000000000..f0da569fc
--- /dev/null
+++ b/legacy/lbxproxy/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=lbxproxy
+pkgver=1.0.3
+pkgrel=0
+pkgdesc="X11 proxy server for the Low Bandwidth extension"
+url="https://www.X.Org/"
+arch="all"
+license="X11"
+depends=""
+makedepends="libice-dev liblbxutil-dev libx11-dev libxext-dev util-macros
+	xorgproto-dev"
+subpackages="$pkgname-doc"
+source="https://www.x.org/releases/individual/app/lbxproxy-$pkgver.tar.bz2"
+
+prepare() {
+	default_prepare
+	chmod a+w config.sub
+	update_config_sub
+}
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="e025101ba6743f98717958c3ff561df3f0fea7b491b2a41639cb8a84ffe9d82d980dcaaa8f50408e3a1a8ecfbd29fbe599a16a0f5de454b05ff82bc2629f68f2  lbxproxy-1.0.3.tar.bz2"
diff --git a/legacy/libxfont/APKBUILD b/legacy/libxfont/APKBUILD
new file mode 100644
index 000000000..c98112974
--- /dev/null
+++ b/legacy/libxfont/APKBUILD
@@ -0,0 +1,35 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=libxfont
+pkgver=1.5.4
+pkgrel=0
+pkgdesc="X11 Font library"
+url="https://www.X.Org/"
+arch="all"
+license="X11"
+depends="xtrans"
+makedepends="freetype-dev libfontenc-dev util-macros xmlto xorgproto-dev"
+subpackages="$pkgname-dev"
+source="https://www.x.org/releases/individual/lib/libXfont-$pkgver.tar.bz2"
+builddir="$srcdir/libXfont-$pkgver"
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="864edbaff45c44bd92bc4b06275c73fdf584a9b88bc523a297d4c75c01ca253f438463e929af70d753ddecfa648bb0b9bcf0ec72267db9f2b1704f7afa906cb3  libXfont-1.5.4.tar.bz2"
diff --git a/legacy/notmuch/0.28.2-disable-rpath.patch b/legacy/notmuch/0.28.2-disable-rpath.patch
new file mode 100644
index 000000000..cc5102614
--- /dev/null
+++ b/legacy/notmuch/0.28.2-disable-rpath.patch
@@ -0,0 +1,48 @@
+From ed15cac16414418c11896071d6ca9238d033f23d Mon Sep 17 00:00:00 2001
+From: Luis Ressel <aranea@aixah.de>
+Date: Mon, 25 Feb 2019 08:18:24 +0100
+Subject: [PATCH] Add a configure flag to disable rpaths
+
+---
+ configure | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index a6f5dfa2..5e7e5aa9 100755
+--- a/configure
++++ b/configure
+@@ -82,6 +82,7 @@ WITH_API_DOCS=1
+ WITH_EMACS=1
+ WITH_DESKTOP=1
+ WITH_BASH=1
++WITH_RPATH=1
+ WITH_RUBY=1
+ WITH_ZSH=1
+ WITH_RETRY_LOCK=1
+@@ -241,6 +242,14 @@ for option; do
+ 	fi
+     elif [ "${option}" = '--without-bash-completion' ] ; then
+ 	WITH_BASH=0
++    elif [ "${option%%=*}" = '--with-rpath' ]; then
++	if [ "${option#*=}" = 'no' ]; then
++	    WITH_RPATH=0
++	else
++	    WITH_RPATH=1
++	fi
++    elif [ "${option}" = '--without-rpath' ] ; then
++	WITH_RPATH=0
+     elif [ "${option%%=*}" = '--with-ruby' ]; then
+ 	if [ "${option#*=}" = 'no' ]; then
+ 	    WITH_RUBY=0
+@@ -928,7 +937,7 @@ fi
+ rm -f compat/check_asctime
+ 
+ printf "Checking for rpath support... "
+-if ${CC} -Wl,--enable-new-dtags -Wl,-rpath,/tmp/ -o minimal minimal.c >/dev/null 2>&1
++if [ $WITH_RPATH = "1" ] && ${CC} -Wl,--enable-new-dtags -Wl,-rpath,/tmp/ -o minimal minimal.c >/dev/null 2>&1
+ then
+     printf "Yes.\n"
+     rpath_ldflags="-Wl,--enable-new-dtags -Wl,-rpath,\$(libdir)"
+-- 
+2.19.2
+
diff --git a/legacy/notmuch/APKBUILD b/legacy/notmuch/APKBUILD
new file mode 100644
index 000000000..b204ef4d9
--- /dev/null
+++ b/legacy/notmuch/APKBUILD
@@ -0,0 +1,96 @@
+# Contributor: Luis Ressel <aranea@aixah.de>
+# Maintainer: 
+pkgname=notmuch
+pkgver=0.28.4
+pkgrel=0
+pkgdesc="Thread-based email index, search and tagging"
+url="https://notmuchmail.org/"
+arch="all"
+license="GPL-3.0+"
+depends=""
+depends_dev="gmime-dev talloc-dev xapian-core-dev zlib-dev"
+makedepends="$depends_dev doxygen emacs python3-dev ruby-dev"
+checkdepends="bash dtach gnupg"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-emacs py3-$pkgname:_py ruby-$pkgname:_rb $pkgname-bash-completion:bashcomp:noarch $pkgname-zsh-completion:zshcomp:noarch"
+source="https://notmuchmail.org/releases/notmuch-$pkgver.tar.gz
+	0.28.2-disable-rpath.patch"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var \
+		--without-bash-completion \
+		--without-desktop \
+		--without-rpath
+	make
+
+	cd bindings/python
+	python3 setup.py build
+}
+
+check() {
+	cd "$builddir"
+	# config, regexp-query: musl issues, TODO: Fixed in master
+	# atomicity, count, new, insert: gdb-based tests which fail randomly on some arches, with some CFLAGS, or during some moon phases
+	NOTMUCH_SKIP_TESTS="config regexp-query atomicity count new insert" make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+doc() {
+	default_doc
+	# TODO: We'd need sphinx to generate the man pages, but the raw *.rst's are still better than no docs at all.
+	mkdir -p "$subpkgdir/usr/share/doc/$pkgname" "$builddir/doc/man"*
+	cp -r "$builddir/doc/man"* "$subpkgdir/usr/share/doc/$pkgname/"
+}
+
+emacs() {
+	mkdir -p "$subpkgdir/usr/bin" "$subpkgdir/usr/share"
+	mv "$pkgdir/usr/bin/notmuch-emacs-mua" "$subpkgdir/usr/bin"
+	mv "$pkgdir/usr/share/emacs" "$subpkgdir/usr/share"
+}
+
+_py() {
+	pkgdesc="$pkgdesc (Python bindings)"
+	depends="$pkgname=$pkgver-r$pkgrel python3"
+
+	cd "$builddir/bindings/python"
+	python3 setup.py install --prefix=/usr --root="$subpkgdir"
+}
+
+_rb() {
+	pkgdesc="$pkgdesc (Ruby bindings)"
+	depends="$pkgname=$pkgver-r$pkgrel ruby"
+
+	cd "$builddir/bindings/ruby"
+	make DESTDIR="$subpkgdir" install
+}
+
+
+bashcomp() {
+	pkgdesc="$pkgdesc (Bash completion)"
+	depends=""
+	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
+
+	install -Dt "$subpkgdir/usr/share/bash-completion" "$builddir/completion/notmuch-completion.bash"
+}
+
+zshcomp() {
+	pkgdesc="$pkgdesc (Zsh completion)"
+	depends=""
+	install_if="$pkgname=$pkgver-r$pkgrel zsh"
+
+	mkdir -p "$subpkgdir/usr/share"
+	mv "$pkgdir/usr/share/zsh" "$subpkgdir/usr/share"
+}
+
+sha512sums="77d7ad81e1f7dc93ae6392346da434f6dc74c21d19be728c2a6ca283c429f36e7081387d223af58eb5f63f5d2a8ad8367f0103f0bb9d052890c07fe419abbee7  notmuch-0.28.4.tar.gz
+b2991ee5edf927f04d904d99888dbce17a98e9d4d7d809bc2248f45d214025f4a1632b19e4fbca2b08e99721ec8a7eea82384c5c718206884801c7bfa5a8c540  0.28.2-disable-rpath.patch"
diff --git a/legacy/proxymngr/APKBUILD b/legacy/proxymngr/APKBUILD
new file mode 100644
index 000000000..4d4d220e6
--- /dev/null
+++ b/legacy/proxymngr/APKBUILD
@@ -0,0 +1,34 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=proxymngr
+pkgver=1.0.4
+pkgrel=0
+pkgdesc="X11 proxy manager service"
+url="https://www.X.Org/"
+arch="all"
+license="X11"
+depends="lbxproxy"
+makedepends="libice-dev libxt-dev util-macros xorgproto-dev"
+subpackages="$pkgname-doc"
+source="https://www.x.org/releases/individual/app/proxymngr-$pkgver.tar.bz2"
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="dce0d93558e674ce82197476d204488505079c8aa5192387e57c06844c4ea83da1cf45238e0a63e2bbf9867388ca1175125b6d7b4036085be89b3de353887fd2  proxymngr-1.0.4.tar.bz2"
diff --git a/legacy/which/APKBUILD b/legacy/which/APKBUILD
new file mode 100644
index 000000000..f8360b7b7
--- /dev/null
+++ b/legacy/which/APKBUILD
@@ -0,0 +1,31 @@
+# Contributor: Stuart Cardall <developer@it-offshore.co.uk>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+pkgname=which
+pkgver=2.21
+pkgrel=2
+pkgdesc="A utility to show the full path of commands"
+url="http://savannah.gnu.org/projects/which"
+arch="all"
+license="GPL-2.0+ AND LGPL-2.0+ AND GPL-3.0+"
+makedepends=""
+subpackages="$pkgname-doc"
+source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
+provider_priority=1
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="d2f04a5c5291f2d7d1226982da7cf999d36cfe24d3f7bda145508efcfb359511251d3c68b860c0ddcedd66b15a0587b648a35ab6d1f173707565305c506dfc61  which-2.21.tar.gz"