Add prefix changes by Christoph Junghans (bug #447540).

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 21 insertions, 97 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index ab8e74717fa9..8d0fc9320b2b 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/lftp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.387 2012/12/16 17:50:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.388 2012/12/17 11:55:25 jer Exp $
+
+  17 Dec 2012; Jeroen Roovers <jer@gentoo.org> -lftp-4.3.7.ebuild,
+  lftp-4.4.0.ebuild:
+  Add prefix changes by Christoph Junghans (bug #447540).
 
   16 Dec 2012; Raúl Porcel <armin76@gentoo.org> lftp-4.4.0.ebuild:
   alpha/ia64/s390/sparc stable wrt #440160
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 077a22ae1c7f..51e091502745 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -5,18 +5,16 @@ AUX lftp-4.0.2.91-lafile.patch 976 SHA256 b54aac35c297657290a2d9571c38bdc4bf5154
 AUX lftp-4.0.3-autoconf-2.64.patch 582 SHA256 f8e6e1d4e114d7e122b1762f9382027541357c39f129f9d2aad9edd93659f53e SHA512 36dad6f0ad5016b6b7f7048d9620330fa3ba414114a6afd4622f0cb06919b12a45457e778eae7bd1d8a1ed1ede04b0c5d664571e510fbd4f756cf675b10d1ff1 WHIRLPOOL 85b5afce5b6914bf502cf4fc5e28b242d41917b948d88ca10074ed4d1abe08bef0aee903e037ce6f08a3f5d167115003fdd2dddd923585fbf2faad394d2b3990
 AUX lftp-4.3.5-autopoint.patch 330 SHA256 5aa4d9b739ffcc9a500988a7c80ca6a192d4ef440bea27278d87a27da50bf909 SHA512 7d7f0628bfe817fb9fb10d36f85f729f2e0b8ae3a6b6c9e719469a109b08b65a465c6d313cbe8a8115e9bc036e07347b6f5df0aa3067f905690b221d4bdf3318 WHIRLPOOL 91a8be4feed34ffd3f9d6ea2eb44968420d8cb57c494520b0ce8fb3f40cce85d136e8b2124eac7fcadbb8c9e1187b9fa6c9256f360079ac41eeb693cc5298c3a
 AUX lftp-4.3.8-gets.patch 430 SHA256 20f3f931132aae70c6dc8b03368419951bb4ec9f0d4cfcaf5966db3c6689da35 SHA512 24e61ec6784fdf95b5df75ed29680465e9fac87f9b79eaf4a9156a32c66afd4db5b905c7e29789a8a0e0d7c6b4c782b1f749e52d4c9547c96c1b79834c2a750a WHIRLPOOL 399f1a0714ada86a47a567d49a1d093b4900847fb38994e9adbc95c82d879e061d057945d66a0f26a6015c3737f586e6b83da8d1d5b30f7f103fc4d2e2ee523e
-DIST lftp-4.3.7.tar.xz 1404336 SHA256 b77589f7274ef391f58ac683d93930b2d9a44f35e29b07e4f9d3f02ffe6185f6 SHA512 31188161aadd47308db8aaf1057176acf43f0d77264e72cd3bb7ba5fe595ed7aed649570ed9c323afd99ecf29e4976c9383fe78c9bddf99e65e6075c84d8fc03 WHIRLPOOL 6ca8f671be416fe22bf76aeadf3f6f8593e3c0ab3bd57c2a27bf94cbaa5bd480b56c1c743fc962204e5fc3d544790f6d1a46adfc1d795854244d4a43decf33a2
 DIST lftp-4.3.8.tar.xz 1407936 SHA256 38951359b3dbec562de8f6b22b3434fb04ace67e7a91023da141474912951962 SHA512 347f3daaaa2dd9955b2c825327f64a40c905a178a91612363f2eec122dc3c48f19ee6baa34268c5aff64dea49e50e23e0525f5f62c85e4a82fe8f0eefe5c7b94 WHIRLPOOL 9d45deb092a9d490f9713bb2dd586690f7e5ac89d6b116d93fdddfef788259d9a3f59543e5618d486b82f77cd9c065aad47673607dd5d9c093d4713fb4aeb31d
 DIST lftp-4.4.0.tar.xz 1428284 SHA256 c79326af45f2f51a5e590d2691f64b3885b3516e0c2c01f97a5e0be5977ae431 SHA512 08386bd1dd61690f615e2a40c0a5c442256bb22bd5e18dea7525c5b25a3a293c5d498f8bd6395f89b22eb5bc7542797d2619e3ea1529b7b1b54d10ed98923621 WHIRLPOOL 27ab86e77f0e7e52e68367529e830f2d4227d6caa8cad3a928da8ec96c9671c3fd1601a5ef447c72b7db0795592406577031d41fadd4748b963dd3d986ddd19a
-EBUILD lftp-4.3.7.ebuild 1860 SHA256 d3f868b5bdef3c4baa86b5eb42338320c29fd16722e8018d3c56a7197b2bd44c SHA512 3b24fc9b3807d9b459ad98ad5826286a22f1c7d836bc6805cec50423137b170152ff6b40ab955c6c72f92497bee7faf37ba8e43606d2bd6e582186af845c04e6 WHIRLPOOL 9026a268588e480d0b127f595571a2cc62fffeac40099d82fb794165f0127b75343f1122b31955144e5e59a12b7eb8b31458180cb4f517e506fd91bc35531f83
 EBUILD lftp-4.3.8.ebuild 1898 SHA256 3006a0379a60b5ebb63320827ca11968fd9c696d635949d361ddc34e52fc53a8 SHA512 51ad104df2405ae945abe1c2e4b4bdd77df658970c7875341c250048ab7f2438a0a301ccfd5d7107c23dbc1af3b3bf2575131992e2b609affb0c4023c979d9f3 WHIRLPOOL 1c3a83357a7527fd38233ed58bf22ff2fcb2939045071d3578df04388676cf7f95d6a64a414559ca770dc8b725ee6750096881bc33362cddbe20d620a1725462
-EBUILD lftp-4.4.0.ebuild 1848 SHA256 ace4522692e91fa1846709b1d7293f6f4a8f3ec24949777bd819035e14ac8cfe SHA512 7c176bd301ab0ae8b49cd16926fa36d531ef5ceda03b496db37cc06ea3516452ac8a6995609210f9dfd9894f4900c7bdcb158876d20eee82055d1c89c8195f6b WHIRLPOOL dd3c09718d4425093fc34fc4fe3e2235b62edad192e4f2096bb6e1ac7d8d52436c21feeeeaec667c4b6a84d13631c85a270f7a753de4866def25093aa245a636
-MISC ChangeLog 49333 SHA256 ff06cd1c9b96a6d9d6af642727e75e2574ea0b249589ba414bc81da416089ad7 SHA512 5e9e345cd30fcf5890c31d738fa47b5749ff9a759744a9a8a855e2bce7b2ef83b5ef54a5046a59ecd15721c20f198d2628b34c1e590ebdbd440b52d1ee9a55d6 WHIRLPOOL 7bd21908db3fa00f33bf8bb5a31e7f17e160585ae01cf33acaea00d8141ca340ca4265791cc93cfe2629157157ee4dca61f27e1fccd854c5555fd7c188be74b1
+EBUILD lftp-4.4.0.ebuild 2003 SHA256 bb7a85ebbe18c96ebaad252feb3864af76710ff14d43c52e8e3de58e2e74a6eb SHA512 80866cf2eefffcd1acdd450b59ba17d4ace6fd6824b9245bed59deaf70b4dc5a350d74849d6e5818cf712705398074b3637540461c1fe367a2c397db7e93011c WHIRLPOOL e99a61093eacd69100fb392227236ed963c8a6365ba6aa984778cf63c8e95f007161a1d260e2151d981e8fef5bceda745cbb99df10ce6b5decfbe1ca9c48928c
+MISC ChangeLog 49476 SHA256 50545fd6e3b3e757f49fe9ceaa62d2340b1304e4886246ed567bc4b146e82cde SHA512 ab4cce9c79856002f35d0ca6ca59e685b50a861f4984fc7a532a01c4c292cea3971829543f53d06cb2172ec39af1570ce97a735b5476789d85dee7687351b284 WHIRLPOOL 96aa7a2afa7cfb7253174ebb44c6a789992a8d41a904ad920bf4477a3dd8f85bc126920ef766083bbef09efc7e06b524f82645a48a73b662ac6a4c9005ab49c0
 MISC metadata.xml 228 SHA256 766b4854103b92707706451db11bd895a0f63036677fdcbff2bccb8de5d6d289 SHA512 d89006995b1adc962506fb900d44c5dd7af2db67a40518bb5ea3325afe7a35d028c3c2eee71b5ad9dc2ab26c7802c14d715a88a7f3fc61449e4418b8b13e42b8 WHIRLPOOL 44d158838e0a1a6b2858a3d463fb6d07b7e18d1446b86013cf50184b3de695a39afde03b51bd27d5fd57ad29e015992af78cdbfb7c60eb8043be750acfd65a15
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDOCdUACgkQuQc30/atMkBARACeNLf4t9m9HRzvpKki532tsKg6
-seoAn3wzdRkaLrdnOTnyDg+WB2NnbSGY
-=JcMQ
+iEYEAREIAAYFAlDPCC4ACgkQVWmRsqeSphOWoACeJ64oIRJ49qz/iVGazhub6jIq
+kCYAnjInKGo8eFQGab8m46EvuscOJSOp
+=fPc6
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/lftp/lftp-4.3.7.ebuild b/net-ftp/lftp/lftp-4.3.7.ebuild
deleted file mode 100644
index 87e7b9510872..000000000000
--- a/net-ftp/lftp/lftp-4.3.7.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.3.7.ebuild,v 1.8 2012/08/19 18:52:45 armin76 Exp $
-
-EAPI="4"
-
-inherit autotools eutils
-
-DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
-HOMEPAGE="http://lftp.yar.ru/"
-SRC_URI="http://ftp.yars.free.net/pub/source/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-fbsd ~x86-fbsd"
-
-LFTP_LINGUAS="cs de es fr it ja ko pl pt_BR ru zh_CN zh_HK zh_TW"
-
-IUSE="
-	$( for i in ${LFTP_LINGUAS}; do echo linguas_${i}; done )
-	gnutls nls socks5 +ssl
-"
-
-RDEPEND="
-	dev-libs/expat
-	>=sys-libs/ncurses-5.1
-	socks5? (
-		>=net-proxy/dante-1.1.12
-		virtual/pam )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.3 )
-		!gnutls? ( >=dev-libs/openssl-0.9.6 )
-	)
-	>=sys-libs/readline-5.1
-"
-
-DEPEND="
-	${RDEPEND}
-	=sys-devel/libtool-2*
-	app-arch/xz-utils
-	dev-lang/perl
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=(
-	BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README  README.debug-levels
-	README.dnssec  README.modules THANKS TODO
-)
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-4.0.2.91-lafile.patch" \
-		"${FILESDIR}/${PN}-4.0.3-autoconf-2.64.patch" \
-		"${FILESDIR}/${PN}-4.3.5-autopoint.patch"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-
-	if use ssl && use gnutls ; then
-		myconf="${myconf} --without-openssl"
-	elif use ssl && ! use gnutls ; then
-		myconf="${myconf} --without-gnutls --with-openssl=/usr"
-	else
-		myconf="${myconf} --without-gnutls --without-openssl"
-	fi
-
-	use socks5 && myconf="${myconf} --with-socksdante=/usr" \
-		|| myconf="${myconf} --without-socksdante"
-
-	econf \
-		--enable-packager-mode \
-		--sysconfdir=/etc/lftp \
-		--with-modules \
-		$(use_enable nls) \
-		${myconf}
-}
diff --git a/net-ftp/lftp/lftp-4.4.0.ebuild b/net-ftp/lftp/lftp-4.4.0.ebuild
index aaa49fa6cbfb..cdebc96e71de 100644
--- a/net-ftp/lftp/lftp-4.4.0.ebuild
+++ b/net-ftp/lftp/lftp-4.4.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.4.0.ebuild,v 1.6 2012/12/16 17:50:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.4.0.ebuild,v 1.7 2012/12/17 11:55:25 jer Exp $
 
 EAPI=4
-inherit autotools eutils
+inherit autotools eutils libtool
 
 DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
 HOMEPAGE="http://lftp.yar.ru/"
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.yars.free.net/pub/source/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 LFTP_LINGUAS="cs de es fr it ja ko pl pt_BR ru zh_CN zh_HK zh_TW"
 
@@ -38,8 +38,8 @@ DEPEND="
 	=sys-devel/libtool-2*
 	app-arch/xz-utils
 	dev-lang/perl
-	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
 "
 
 DOCS=(
@@ -53,6 +53,7 @@ src_prepare() {
 		"${FILESDIR}/${PN}-4.3.5-autopoint.patch" \
 		"${FILESDIR}/${PN}-4.3.8-gets.patch"
 	eautoreconf
+	elibtoolize # for Darwin bundles
 }
 
 src_configure() {
@@ -61,18 +62,18 @@ src_configure() {
 	if use ssl && use gnutls ; then
 		myconf="${myconf} --without-openssl"
 	elif use ssl && ! use gnutls ; then
-		myconf="${myconf} --without-gnutls --with-openssl=/usr"
+		myconf="${myconf} --without-gnutls --with-openssl=${EPREFIX}/usr"
 	else
 		myconf="${myconf} --without-gnutls --without-openssl"
 	fi
 
-	use socks5 && myconf="${myconf} --with-socksdante=/usr" \
+	use socks5 && myconf="${myconf} --with-socksdante=${EPREFIX}/usr" \
 		|| myconf="${myconf} --without-socksdante"
 
 	econf \
-		--enable-packager-mode \
-		--sysconfdir=/etc/lftp \
-		--with-modules \
 		$(use_enable nls) \
-		${myconf}
+		${myconf} \
+		--enable-packager-mode \
+		--sysconfdir="${EPREFIX}"/etc/lftp \
+		--with-modules
 }