gentoo resync : 09.07.2022

7 files changed, 95 insertions, 129 deletions

diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 68ae9395b7a0..c86192b61f13 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/jpilot/Manifest b/app-pda/jpilot/Manifest
index 4429b8d9cc59..c9b1376303d9 100644
--- a/app-pda/jpilot/Manifest
+++ b/app-pda/jpilot/Manifest
@@ -2,5 +2,5 @@ AUX jpilot-1.8.2-fix-paths.patch 3619 BLAKE2B 01d77eb206f2ce4c1f28b2950334f0814f
 AUX jpilot-1.8.2-fno-common.patch 1094 BLAKE2B 50e039c59bd36af356c9eb53d144be622cc36af5be86464c135ff3184ad5f7bc59bfcb9d19287ba56d59e3eab33274cb8dcc220c8fc1429d4c82df0711d3feb5 SHA512 50d4f6c924fb3c5241d424ec5457f80f93a4fa5dc6dcd9f31e0a2d44bc696ea5ad9f6cd447dfae6f3a6b97a9c951977a0b98379ef3b548eba4b0d1732443bf87
 AUX jpilot-1.8.2-qa-desktop-file.patch 280 BLAKE2B 8a84005ce60627cea1f6b8b9ce96e824a65b621d63706703d15a3dd1ed48945ab100927a885d8c7e40c2688194f89a151be96729b26d6cb4d081024095ed3178 SHA512 ccc59b87c5e7f9074e83e9c3a47799c6779c29583fbd9845a26ad735342b22bf390bf8bed50dc2adac097dea00823ea587c8a5abdce4c197f5160e59c4617a37
 DIST jpilot-1.8.2.tar.gz 1740735 BLAKE2B efc9fb8e88843d6e0f4f2245753d67856c9d0cd455c9a22c829bb103631fd8a8111ead3cb4bc434a6be00ad0cb35fe554a9ebbe1f2d38bfaf560e1b414c62260 SHA512 733dd51a2acc60760bb1ffaa0d7b4433584a571793d5e4f857492349bae8d032625baf9f0060e619d760628ddda3559bf4be057f45f4dc17ddf1af1ca795c024
-EBUILD jpilot-1.8.2-r1.ebuild 1009 BLAKE2B 21d4a9ddb4582f7fa038edf10a6c7393c5d04359a9b679c60591221edad821fe6b4a55e662763b023806e15bd54d71cb0feacbb587962148eb25ca3200c2ee4f SHA512 59de8c25c95eb9dbe825131a1036ca9fb00b0021e62c1d9a82dfb4f06292e25d26502b2ab0770eef91b7c75eb0f9a7cf678f18b086a2de91fe170c830f46223b
+EBUILD jpilot-1.8.2-r1.ebuild 1013 BLAKE2B 983d386a0cb727151d9dd2f69d5480bf0a211fef47ffa50ad97978dff4c869d615e81996489c9cc1c513578acc7ab71f8965ac13b896a9334d68803a6523b4c4 SHA512 6f9cadabb42969ffe320e6260fd441b278265bafb5613f527df85dd3918c9359dce26240c3a648a760643df4268292241e1c34aa0852d9bd415d27b25e393bad
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-pda/jpilot/jpilot-1.8.2-r1.ebuild b/app-pda/jpilot/jpilot-1.8.2-r1.ebuild
index 168934bd8aef..0dd467c30b87 100644
--- a/app-pda/jpilot/jpilot-1.8.2-r1.ebuild
+++ b/app-pda/jpilot/jpilot-1.8.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://jpilot.org/tarballs/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/app-pda/pilot-link/Manifest b/app-pda/pilot-link/Manifest
index c2fea131d800..53d20e0e2d4c 100644
--- a/app-pda/pilot-link/Manifest
+++ b/app-pda/pilot-link/Manifest
@@ -1,5 +1,4 @@
-AUX pilot-link-0.12.5-Werror-args.patch 851 BLAKE2B 4f011a10975b9ba1a2fe29e282ae88fc964df50dd6c2f982545a30f785ef6e3170fdd19efb174e8fb47777bb56debac7aae911c89ea9afc8317529f4c015a72f SHA512 8caf0fc9c95f2332d60753269de919f9775be0a471e13f8c27f7ecd47346850696ab9a79b7e1b82ab8235367c35eecfbe3cc8bb7b04da5fea8d41e7786b2b7c7
-DIST pilot-link-0.12.5-gentoo-patchset.tar.bz2 8182 BLAKE2B db6e053bebc2876308d5bf5c29b86b9f22aecd0e75ed6d16e9214d63d73cb5e2dc7080bcd03a9d4dc21d4f2ef84d9632bac6cd36673d93915db9fd095ae12dfd SHA512 141900ef42d8a6716d7e0a219e1b75609f392c393376fb60f645561cfe1cf67ad9cec03321a31dcf1e8a70c75591df6eac4f727c957487496ab46ae6aa2dc90d
+DIST pilot-link-0.12.5-gentoo-patchset-r2.tar.xz 8828 BLAKE2B 6ae7dc9297dedd667bff569150aaae22bb1990b9321774dd29a4b36e7bd824c3c1e7ba60eeb30380727f1acc947df48867c6e536d2901486ac09ea3e3dbdec18 SHA512 6d4e5a572684087b203932b6c199a2a19ba0418794d164f24b04a85873ad3f7f228c1b85b0d1031c30aaf8101db2022fc1490a27331ea7525c5f41e6068af306
 DIST pilot-link-0.12.5.tar.bz2 1578735 BLAKE2B acc8748448d90928ac393e3d716f9d12c7962e18564a738b5f01e19bb225d610e179bb0694aded57979c7240df2652cac72845e5b8cdcddf6a4a800bbac4424b SHA512 a12972fb7a43f2dfccb82a046ca372c9fce5333f632a77880439c4f4705af6a7f16b76f04c9f3ed0d6a12aad55a3a55f8781a4e92931bc6907cd1ec4f1209868
-EBUILD pilot-link-0.12.5-r3.ebuild 2990 BLAKE2B 4f86519f998323bb7394abddf99c3099511578bc3bef027882adec46d65284b69a51038f608d0865b74600d0a2f233ed54a792d5f4c210735b2221500420a2d6 SHA512 08b46767285f828dc21b8b77ae0081b81d8aebe0b79ad3b48745246294e960b5f503355fa668286422bcb2de1edf19782ebc217bc79e83329deca9376fb97c70
+EBUILD pilot-link-0.12.5-r4.ebuild 2053 BLAKE2B 8465f64485fbad0cab339b67a75225d8ecc30761079c25f11ef1aa7ee079b10b338dcf57de4b21fdb8b6864ccb91f26b156db0d30a49f624fd36a702dfc0ba63 SHA512 024e7db25c382784ea17efbc2a105405ac4e9c5b28a41238527b030bb228053095feca4242dd38919a2f20c18f90eaded0d3ab44420e7736183fa4e231cf045c
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.5-Werror-args.patch b/app-pda/pilot-link/files/pilot-link-0.12.5-Werror-args.patch
deleted file mode 100644
index 5e6b939d0100..000000000000
--- a/app-pda/pilot-link/files/pilot-link-0.12.5-Werror-args.patch
+++ /dev/null
@@ -1,18 +0,0 @@
--Werror can have args now, but didn't when this code was originally written.
-
-Closes: https://bugs.gentoo.org/show_bug.cgi?id=714828
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
---- pilot-link-0.12.5.orig/configure.ac	2020-08-02 21:58:12.481559328 -0700
-+++ pilot-link-0.12.5/configure.ac	2020-08-02 22:02:49.641291824 -0700
-@@ -63,8 +63,8 @@
- dnl Eat -Werror so configure will run properly, if the user provided it
- enable_werror=no
- save_CFLAGS="$CFLAGS"
--CFLAGS=`echo $save_CFLAGS | sed -e s/-Werror//g`
--CXXFLAGS=`echo $save_CXXFLAGS | sed -e s/-Werror//g`
-+CFLAGS=`echo $save_CFLAGS | sed -r -e 's/-Werror(=[^[:space:]]+)?//g'`
-+CXXFLAGS=`echo $save_CXXFLAGS | sed -r -e 's/-Werror(=[^[:space:]]+)?//g'`
- if test "x$CFLAGS" != "x$save_CFLAGS"; then
- 	dnl -Werror was set; treat it as implicit --enable-werror below
- 	enable_werror="yes"
diff --git a/app-pda/pilot-link/pilot-link-0.12.5-r3.ebuild b/app-pda/pilot-link/pilot-link-0.12.5-r3.ebuild
deleted file mode 100644
index 61b734b732d0..000000000000
--- a/app-pda/pilot-link/pilot-link-0.12.5-r3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools perl-module
-
-DESCRIPTION="Suite of tools for moving data between a Palm device and a desktop"
-# this is a new mirror; the distfile has the same content inside the tarball,
-# but the tarball itself doesn't match due to recompression and Git
-# indirection.
-HOMEPAGE="https://github.com/jichu4n/pilot-link"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
-
-LICENSE="|| ( GPL-2 LGPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bluetooth debug perl png static-libs threads usb"
-
-COMMON_DEPEND="
-	dev-libs/popt
-	>=sys-libs/ncurses-5.7-r7:0=
-	>=sys-libs/readline-6:0=
-	virtual/libiconv
-	bluetooth? ( net-wireless/bluez )
-	perl? ( >=dev-lang/perl-5.12 )
-	png? ( media-libs/libpng:0= )
-	usb? ( virtual/libusb:0 )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT="test" #672872
-
-src_prepare() {
-	default
-
-	eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-java-install.patch
-	eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-respect-javacflags.patch
-	eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.2-werror_194921.patch
-	eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.2-threads.patch
-	eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-libpng14.patch
-	eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-png.patch
-	eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-distutils.patch
-	eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-libusb-compat-usb_open.patch
-	eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.5-perl514.patch
-	eapply -p1 "${FILESDIR}"/${PN}-0.12.5-Werror-args.patch
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467600
-
-	AT_M4DIR="m4" eautoreconf
-
-}
-
-src_configure() {
-	# tcl/tk support is disabled as per upstream request.
-	# readline is not really optional, bug #626504
-	# Does not build with Java 8
-	# Does not build with Python 3, bug 735238
-	econf \
-		--includedir="${EPREFIX}"/usr/include/libpisock \
-		$(use_enable static-libs static) \
-		--enable-conduits \
-		--with-readline \
-		$(use_enable threads) \
-		$(use_enable usb libusb) \
-		$(use_enable debug) \
-		$(use_with png libpng) \
-		$(use_with bluetooth bluez) \
-		$(use_with perl) \
-		--without-java \
-		--without-tcl \
-		--without-python
-}
-
-src_compile() {
-	emake
-
-	if use perl; then
-		cd "${S}"/bindings/Perl
-		perl-module_src_configure
-		local mymake=( OTHERLDFLAGS="${LDFLAGS} -L../../libpisock/.libs -lpisock" ) #308629
-		perl-module_src_compile
-	fi
-
-	# Python 2.0 only; not enabled anymore
-	# bug 735238
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog NEWS README doc/{README*,TODO}
-
-	if use perl; then
-		cd "${S}"/bindings/Perl
-		perl-module_src_install
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	perl_set_version
-}
diff --git a/app-pda/pilot-link/pilot-link-0.12.5-r4.ebuild b/app-pda/pilot-link/pilot-link-0.12.5-r4.ebuild
new file mode 100644
index 000000000000..893b7b45b835
--- /dev/null
+++ b/app-pda/pilot-link/pilot-link-0.12.5-r4.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools perl-module
+
+DESCRIPTION="Suite of tools for moving data between a Palm device and a desktop"
+# this is a new mirror; the distfile has the same content inside the tarball,
+# but the tarball itself doesn't match due to recompression and Git
+# indirection.
+HOMEPAGE="https://github.com/jichu4n/pilot-link"
+SRC_URI="
+	mirror://gentoo/${P}.tar.bz2
+	https://dev.gentoo.org/~soap/distfiles/${P}-gentoo-patchset-r2.tar.xz"
+
+LICENSE="|| ( GPL-2 LGPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bluetooth perl png threads usb"
+RESTRICT="test" #672872
+
+RDEPEND="
+	dev-libs/popt
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	virtual/libiconv
+	bluetooth? ( net-wireless/bluez )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:= )
+	usb? ( virtual/libusb:0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	perl? ( dev-lang/perl )"
+
+PATCHES=( "${WORKDIR}/${P}-gentoo-patchset"/ )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# tcl/tk support is disabled as per upstream request.
+	# readline is not really optional, bug #626504
+	# Does not build with Java 8
+	# Does not build with Python 3, bug #735238
+	econf \
+		--includedir="${EPREFIX}"/usr/include/libpisock \
+		--enable-conduits \
+		--with-readline \
+		$(use_enable threads) \
+		$(use_enable usb libusb) \
+		$(use_with png libpng) \
+		$(use_with bluetooth bluez) \
+		$(use_with perl) \
+		--without-java \
+		--without-tcl \
+		--without-python
+
+	if use perl; then
+		perl_set_version
+
+		cd bindings/Perl || die
+		perl-module_src_configure
+	fi
+}
+
+src_compile() {
+	emake
+
+	if use perl; then
+		cd bindings/Perl || die
+		local mymake=( OTHERLDFLAGS="${LDFLAGS} -L../../libpisock/.libs -lpisock" ) #308629
+		perl-module_src_compile
+	fi
+}
+
+src_install() {
+	default
+	dodoc doc/{README*,TODO}
+
+	if use perl; then
+		cd bindings/Perl || die
+		perl-module_src_install
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}