Stable for all. Drop old.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC42EB5D6

4 files changed, 15 insertions, 133 deletions

diff --git a/app-pda/pilot-link/ChangeLog b/app-pda/pilot-link/ChangeLog
index 267bfde142ff..a67389001961 100644
--- a/app-pda/pilot-link/ChangeLog
+++ b/app-pda/pilot-link/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-pda/pilot-link
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/ChangeLog,v 1.76 2014/05/31 16:24:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/ChangeLog,v 1.77 2014/07/15 09:07:45 zlogene Exp $
+
+  15 Jul 2014; Mikle Kolyada <zlogene@gentoo.org> -pilot-link-0.12.5.ebuild,
+  pilot-link-0.12.5-r1.ebuild:
+  Stable for all. Drop old.
 
   31 May 2014; Samuli Suominen <ssuominen@gentoo.org>
   pilot-link-0.12.5-r1.ebuild:
diff --git a/app-pda/pilot-link/Manifest b/app-pda/pilot-link/Manifest
index 8ddf2f21ca0b..3029c858ecc0 100644
--- a/app-pda/pilot-link/Manifest
+++ b/app-pda/pilot-link/Manifest
@@ -11,18 +11,15 @@ AUX pilot-link-0.12.3-png.patch 2166 SHA256 8f4781f1c88f374b03de28a2952eacdc0efd
 AUX pilot-link-0.12.3-respect-javacflags.patch 398 SHA256 0760edd9a77bf98bb4155542cec41bff8f130e3b63d11805c4323ff8f13ef464 SHA512 ed870693424cd79fa3c60c0f803008b7c29b24e5dd1b55bf7b5e11eed3f62603dc65c6eefa81bc025e845acd8d9b946c09e36e8cb5603a667e2f5bf4050c78c4 WHIRLPOOL d287bc76cdeb122d7dadd1b8c442e5d327b933c4f536dd7aebb6d7ed1ac4ee7760336d4bc92cdb694b18b70162f51bc3df31c83670e090a54b0662bda9408923
 AUX pilot-link-0.12.5-perl514.patch 22730 SHA256 d2c8c6d07b775feea797b4f9a94b66d58a7a6a41b713e89769bf5295043f2f07 SHA512 5af6097ae46512b83c767e98f890a6f6a6b9101a9e97d9148a66bdaa4b8a9e849885b549f9f92512a6db2bbb38523833d3631ec57edafd6bb2a33720ad08023c WHIRLPOOL 75c58e4ced993c35bb46a790537288d4d492fa0058c216083fb81984c30c8e94634779d60d90f32cde30d332f64a658cdc41c32eeacfc1045c9a8a1b0f1a1dc1
 DIST pilot-link-0.12.5.tar.bz2 1578735 SHA256 d3f99ec04016b38995fb370265200254710318105c792c017d3aaccfb97a84b2 SHA512 a12972fb7a43f2dfccb82a046ca372c9fce5333f632a77880439c4f4705af6a7f16b76f04c9f3ed0d6a12aad55a3a55f8781a4e92931bc6907cd1ec4f1209868 WHIRLPOOL 1db6c658c8a478ba01e2a6ab829ee348757af0b5927c1d2bec729405d2d58ea7b98ba7cf008dd72e1f6afbe9abcccc5fa7aaee7958fdf9f8d9f4e9a4224f340f
-EBUILD pilot-link-0.12.5-r1.ebuild 2821 SHA256 4ff3b506deb31ffe0c52ce1492d3cfa805555eef8e9008a9255a84e8900afa41 SHA512 0f1380fcc141a7fe1c0528ea49dc9cb1861ac1eeb0ff0b236f0f283c42977d6bed132906d7ad78506b576d2f109beea417dd6c51150a64ba877f39553277756a WHIRLPOOL 80534d7a0263ef8c6fa2cc455b3a71fad4f8b09e45e542ae59c9984a4a54fee81666a5bff19dfb1e0649428091f88f63b20951d556f5e7e79c067b3dfdf6c6ac
-EBUILD pilot-link-0.12.5.ebuild 2947 SHA256 4ece1ac9cec3178115f70692edcc696f09134fbef2326c19786794671e3ee1e4 SHA512 5a6ffd6d5d03463c8bc2e4fa8e92c25cd6dbfc296aa4fa46298a805c5eb445aa4f497fc419f04e8079a0e7ccb87eb3e67754c990a545cbc938b99321112d2887 WHIRLPOOL 483ab27e2ae49c9f40667dc6d9a739ec24efe8717c81cff7b15d6d5f930481fbd99b49344c29e32530166181bd978ef83cf9841ea69a8de426d4e95a2e8a2f10
-MISC ChangeLog 15500 SHA256 6a3b3b887d795ef1cdecb44eda12b5a3b7bc1ea269747e1a1b963a146ad6a441 SHA512 e6ce20b19e39417627ab96deffc39246e7378afd158434ab8a039d6f17e167504da9d86dc29159921318f68ef3ac67d141ed9508431e6e8410dbbd8980edd192 WHIRLPOOL cd80f3fd9cfd99880ff74c27346fe50dec3541cdde7129e403756d284cc6a707f2db38defe9aea65e5088c26e4d3740080c16205a0560b89cac22218a3d48523
+EBUILD pilot-link-0.12.5-r1.ebuild 2812 SHA256 ad543b098ddcb20c4e112a1f334832ed2c5d8ccb36397ee69baca5a144c1f229 SHA512 353a6c1fc3b4b9d3af68c61227afbb78f2cc1f623235440ae6f438fb0008a6b347f4ea8336dfe461e882b90cf905b27565d624be86ae8ed224311b8d735ed60c WHIRLPOOL 40dccc03ac987a8dde4400c622e87bcd7528e38f3ef1badbdee165e58a4efb2daa8f73b27ba1a4898c347408d041e0d0b2a0cf0eb7e8d482fa05662fcccc9d36
+MISC ChangeLog 15635 SHA256 dbf7d95f69eed258e4b653a2bcd4eca3e7a97554ea689dbe86bfa00c7d0879d5 SHA512 14b545d97c1a3caec7a7c10d47f327c0e2af26ddaa07049958890f032ef10ec757b9d712da59d3e2f20b8deffe35167582e910d22b187cbef4bf2b7e266b1644 WHIRLPOOL 0ca13e43f1d23ce410e6b4c04a6efbe3c0c10258f168f24dedd6af743aee581065cbaec510e60f4c3fda2689a42bf11cfb4b407c4717db196a11bedfb7c604ed
 MISC metadata.xml 156 SHA256 7f72b73f6e0d6e26603d85e52cca524711faddf6b516640104c3b82aab4754fb SHA512 c07d56b6668ae429bd774f35ecae73eb324423aa863c7cc327a511de84d24f099668029fde69132110676115b4763ee96e3e1a7ef1a9db6248d606e65df11d4b WHIRLPOOL 4364f66f79aa67bc6b1762698b41683da5018d08602f509f525bc3e4a3521f2100e0ea92d84bb30617bef9beda48a3cc0ef9b1b9a4219fe05a54559d7423b6d1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTigG+AAoJEEdUh39IaPFNVa0H/0vazE8865s2zAe2n3I0CqrM
-BAxJVImETjyPX1vIbCx2MaOcJPPt5DqS+FgO5UfLYxGI3oi/arP0PlgQ4zzEFTw3
-9PYLwHWtBwc7EB1J616Gq4gALRsYBBn6JTsteGgw35udJHg3mc0L7WgqRk+si+rq
-bxgYWkvJDSSBqRQoNepM2RpzaDTHfiVxTiO6Ati4NvEWk4AA0T0MC2oSMmN+52zs
-nJYeMpOoS20M2NjjgYp4dJ0+mrxaBme4e5fF6DYCvBmiKoDwKtkG7eogi5+gn3AT
-l7TXqJqJ9lmcQ7s2w2Oydhg+lhOV/lcxFFZz0ZUYjABF8I01a47pd0lC/iEsJ7U=
-=BhCO
+iJwEAQEIAAYFAlPE8KEACgkQG9wOWsQutdZoEwP/RijqhCJe685vjJ9OWHQtHqDI
+XFw9SlmEFYWN1uLadaFpaRm6o5xivB+Eaa1GntmcL3Kt8L5CJVow8H2N3QaSbty4
+T+V7xegVJuWHPqEIflsLIQ61SMpnVPVZeRAMaWQbooiBn0mzOGc1ENOv4iCugnF4
++I0EasC1ViVdteTF9sU=
+=U/Sm
 -----END PGP SIGNATURE-----
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
index 7d2f40277a56..813024973939 100644
--- a/app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild
+++ b/app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild,v 1.2 2014/05/31 16:24:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild,v 1.3 2014/07/15 09:07:45 zlogene Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://pilot-link.org/source/${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 readline static-libs threads usb"
 
 COMMON_DEPEND="dev-libs/popt
diff --git a/app-pda/pilot-link/pilot-link-0.12.5.ebuild b/app-pda/pilot-link/pilot-link-0.12.5.ebuild
deleted file mode 100644
index bc193cb587c0..000000000000
--- a/app-pda/pilot-link/pilot-link-0.12.5.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/pilot-link-0.12.5.ebuild,v 1.11 2012/08/29 03:20:32 blueness Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit autotools distutils 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"
-
-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
-	virtual/libiconv
-	bluetooth? ( net-wireless/bluez )
-	perl? ( >=dev-lang/perl-5.12 )
-	png? ( media-libs/libpng:0 )
-	readline? ( >=sys-libs/readline-6 )
-	usb? ( virtual/libusb:0 )"
-DEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.4 )"
-
-PYTHON_MODNAME="pisock.py pisockextras.py"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.12.3-java-install.patch \
-		"${FILESDIR}"/${PN}-0.12.3-respect-javacflags.patch \
-		"${FILESDIR}"/${PN}-0.12.2-werror_194921.patch \
-		"${FILESDIR}"/${PN}-0.12.2-threads.patch \
-		"${FILESDIR}"/${PN}-0.12.3-{libpng14,png}.patch \
-		"${FILESDIR}"/${PN}-0.12.3-distutils.patch \
-		"${FILESDIR}"/${PN}-0.12.3-libusb-compat-usb_open.patch \
-		"${FILESDIR}"/${PN}-0.12.5-perl514.patch
-
-	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 || die
-
-	if use perl; then
-		cd "${S}"/bindings/Perl
-		perl-module_src_prep
-		local mymake=( OTHERLDFLAGS="${LDFLAGS} -L../../libpisock/.libs -lpisock" ) #308629
-		perl-module_src_compile
-	fi
-
-	if use python; then
-		cd "${S}"/bindings/Python
-		distutils_src_compile
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS 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_src_install
-	fi
-
-	find "${D}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_preinst() {
-	perl-module_pkg_preinst
-	java-pkg-opt-2_pkg_preinst
-}
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}