gentoo resync : 25.08.2020

3 files changed, 125 insertions, 0 deletions

diff --git a/app-pda/pilot-link/Manifest b/app-pda/pilot-link/Manifest
index 83f5ca63d49f..b427e1cfac93 100644
--- a/app-pda/pilot-link/Manifest
+++ b/app-pda/pilot-link/Manifest
@@ -1,4 +1,6 @@
+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.tar.bz2 1578735 BLAKE2B acc8748448d90928ac393e3d716f9d12c7962e18564a738b5f01e19bb225d610e179bb0694aded57979c7240df2652cac72845e5b8cdcddf6a4a800bbac4424b SHA512 a12972fb7a43f2dfccb82a046ca372c9fce5333f632a77880439c4f4705af6a7f16b76f04c9f3ed0d6a12aad55a3a55f8781a4e92931bc6907cd1ec4f1209868
 EBUILD pilot-link-0.12.5-r2.ebuild 3074 BLAKE2B 262f8a5972dde1f3f8e3835926aad69553b8b63dd6a2a1cb352e1ac650df228044a4823e6ea0558d5527c5199c8aba2cd8e9977a04ad66001c7bc60b04fb1d12 SHA512 c408dcd0478bd70f7e5dc32f51c08699e00bf3069288ec8c70de9cef01105fbd2adc56d1e4bee75b25f41483bcf4d933db87a14b5cfed5c2dbc0c69bb57a8533
+EBUILD pilot-link-0.12.5-r3.ebuild 2994 BLAKE2B df8c33e816eeac059be78d2fecb0ef6aa87880712886fc191e7029058ba37f7e250a92d35e22637558bbfa868dc2b1400246e05cdd34b70ea037e2d95e30a348 SHA512 4820827674f08866552569016016bc67d0bd1adbf111842e54a140edab357bda323ecf0f44048abea0ebf01cb552f59ffa81b5819badd8b0c689c43d0f91946d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
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
new file mode 100644
index 000000000000..5e6b939d0100
--- /dev/null
+++ b/app-pda/pilot-link/files/pilot-link-0.12.5-Werror-args.patch
@@ -0,0 +1,18 @@
+-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
new file mode 100644
index 000000000000..f28d43f7d288
--- /dev/null
+++ b/app-pda/pilot-link/pilot-link-0.12.5-r3.ebuild
@@ -0,0 +1,105 @@
+# 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
+}