gentoo resync : 03.03.2019

3 files changed, 2 insertions, 112 deletions

diff --git a/app-pda/pilot-link/Manifest b/app-pda/pilot-link/Manifest
index 14988334e984..6eac2c2573cf 100644
--- a/app-pda/pilot-link/Manifest
+++ b/app-pda/pilot-link/Manifest
@@ -1,5 +1,4 @@
 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-r1.ebuild 2915 BLAKE2B c2f046807b4e573861361f522d59c318e800114095addac35d7f08355e7152ca35f5d4ba3450ed23ab42df1e3aeb671a6cc667567a8111a3053e42ef344c5dc8 SHA512 9376978300128ba5b930a36a497c4f8ce36640ad6cac9b0ca1412fd285f9202cfba1254f95d2157068cf42f66f44a16b73fc5bd0d59896a3b9bc88fef12acf57
-EBUILD pilot-link-0.12.5-r2.ebuild 3084 BLAKE2B ff356533b77e5a8efdf30f58e5581c0d45a8b24b85f1c473c0938586fd4e000062fc1347d67721f3f335d9c599bfe1ee515d30c5bf9810f3257616f9cf6284f1 SHA512 e1767505c9036a75ac31d5173d8115858183e073d2607a4cc1bd6a317864a86cc6c279bcea35be6d7d4f5e73e882baa3410b3aa3ef36b807e92db006cb7e8d4e
+EBUILD pilot-link-0.12.5-r2.ebuild 3083 BLAKE2B cdaee7a17f7ff384fcf0f31856fa6719a68861455bffda1dfbd4e37f2e26b5ece50e868ae3c2eb998e7d52c41fa2da065163e4a5624e8334a73f42075629bd36 SHA512 c311cfe2e74c520250ef34154cd7fb469ea0d68684929cafe18a30ad3839c7aa3ef1f0476b64a5e7f8ef50662b7b5569b7d13f682cadcdac0f4474bd327a1568
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild b/app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild
deleted file mode 100644
index 87cf90a2b960..000000000000
--- a/app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools distutils-r1 eutils perl-module java-pkg-opt-2
-
-DESCRIPTION="suite of tools for moving data between a Palm device and a desktop"
-HOMEPAGE="http://www.pilot-link.org/"
-SRC_URI="http://pilot-link.org/source/${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 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="bluetooth debug java perl png python readline static-libs threads usb"
-
-COMMON_DEPEND="dev-libs/popt
-	>=sys-libs/ncurses-5.7-r7:0=
-	virtual/libiconv
-	bluetooth? ( net-wireless/bluez )
-	perl? ( >=dev-lang/perl-5.12 )
-	png? ( media-libs/libpng:0= )
-	readline? ( >=sys-libs/readline-6:0= )
-	usb? ( virtual/libusb:0 )"
-DEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.4 )"
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-java-install.patch \
-		"${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-respect-javacflags.patch \
-		"${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.2-werror_194921.patch \
-		"${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.2-threads.patch \
-		"${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-{libpng14,png}.patch \
-		"${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-distutils.patch \
-		"${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-libusb-compat-usb_open.patch \
-		"${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.5-perl514.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.
-	econf \
-		--includedir="${EPREFIX}"/usr/include/libpisock \
-		$(use_enable static-libs static) \
-		--enable-conduits \
-		$(use_enable threads) \
-		$(use_enable usb libusb) \
-		$(use_enable debug) \
-		$(use_with png libpng) \
-		$(use_with bluetooth bluez) \
-		$(use_with readline) \
-		$(use_with perl) \
-		$(use_with java) \
-		--without-tcl \
-		$(use_with 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
-
-	if use python; then
-		cd "${S}"/bindings/Python
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog NEWS README doc/{README*,TODO}
-
-	if use java; then
-		cd "${S}"/bindings/Java
-		java-pkg_newjar ${PN}.jar
-		java-pkg_doso libjpisock.so
-	fi
-
-	if use perl; then
-		cd "${S}"/bindings/Perl
-		perl-module_src_install
-	fi
-
-	if use python; then
-		cd "${S}"/bindings/Python
-		distutils-r1_src_install
-	fi
-
-	find "${D}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_preinst() {
-	perl_set_version
-	java-pkg-opt-2_pkg_preinst
-}
diff --git a/app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild b/app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild
index 8f19a9e6f769..0a847e508d72 100644
--- a/app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild
+++ b/app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="|| ( GPL-2 LGPL-2 )"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="bluetooth debug java perl png python static-libs threads usb"
 
 COMMON_DEPEND="