another patch to handle bookmarks in home directory. bug #140143

(Portage version: 2.1.1_pre3-r5)
 (Signed Manifest commit)

5 files changed, 18 insertions, 120 deletions

diff --git a/net-ftp/pftpfxp/Manifest b/net-ftp/pftpfxp/Manifest
index ad12b13ff2d6..66e603d1aadd 100644
--- a/net-ftp/pftpfxp/Manifest
+++ b/net-ftp/pftpfxp/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0.11.4.6-correct_bookmark_path.patch 4188 RMD160 c80f2cfb3ccd497ff4eb5fb1dbff8c10f97b38c4 SHA1 82954335f0d0ed894110496f457583741ba16476 SHA256 3cf45197a50d68a2bbc0628f9f6c4413ec39ad5a0dedf3a5c7ba12c0bdd69a25
+MD5 5bd7c291c54353b9fae66853ff46e0eb files/0.11.4.6-correct_bookmark_path.patch 4188
+RMD160 c80f2cfb3ccd497ff4eb5fb1dbff8c10f97b38c4 files/0.11.4.6-correct_bookmark_path.patch 4188
+SHA256 3cf45197a50d68a2bbc0628f9f6c4413ec39ad5a0dedf3a5c7ba12c0bdd69a25 files/0.11.4.6-correct_bookmark_path.patch 4188
 AUX 0.11.4.6-correct_config_fix.patch 3627 RMD160 abdc33a659ca21b73fdede3ceb5d851c2dc20617 SHA1 a6863c2e625ded0b7f79868752aa28e773dfde2a SHA256 1ff39aedb3b7bba0fb3e76b9786dde4b24dd7ae8d28d588206012abe9ec17fa9
 MD5 65ca1062a877b4542ebbccda0623fe81 files/0.11.4.6-correct_config_fix.patch 3627
 RMD160 abdc33a659ca21b73fdede3ceb5d851c2dc20617 files/0.11.4.6-correct_config_fix.patch 3627
@@ -14,22 +18,18 @@ MD5 fd3271b459d87ed5fce0e0fd47f72cff files/pftpfxp-v0.11.4mew6-pret.patch 3559
 RMD160 b4321eadfb2f1283ee9b99a234fbb635829aea02 files/pftpfxp-v0.11.4mew6-pret.patch 3559
 SHA256 ba74c7a64c3904961a3ed47e711f1bd6960315b2b3b8ecf83a3480d500ed9309 files/pftpfxp-v0.11.4mew6-pret.patch 3559
 DIST pftpfxp-v0.11.4mew6.tgz 137093 RMD160 7d60f8cb2469d7bb95561631c05a5692dccde995 SHA1 b64483097be88218a9238a4050155e22342541d4 SHA256 c119435cd844eda76631dde77104e2d0daeef44923158776927d3b51dd5b1e9b
-EBUILD pftpfxp-0.11.4.6-r1.ebuild 1369 RMD160 207cb0f9452f9323d4a2fde98343ffa9500b96ad SHA1 cb9c824367dcc09a92633210f77ceb5e6d527a23 SHA256 7e5756b63cbaebb426ff60391e0b4c0dca0cc597aaa0b0de71883cf1b49009b2
-MD5 0355df25e259fbc105afb460c842f4dc pftpfxp-0.11.4.6-r1.ebuild 1369
-RMD160 207cb0f9452f9323d4a2fde98343ffa9500b96ad pftpfxp-0.11.4.6-r1.ebuild 1369
-SHA256 7e5756b63cbaebb426ff60391e0b4c0dca0cc597aaa0b0de71883cf1b49009b2 pftpfxp-0.11.4.6-r1.ebuild 1369
-EBUILD pftpfxp-0.11.4.6-r2.ebuild 1445 RMD160 a17748a5c774dcab271b202e4b42367f1d42c43f SHA1 1a00caa25c3f401224bf4d93474da533e36ad040 SHA256 3916ecb450a7863b37ecadd4b36d93ca801214609bf9f2e5ebf9dea75d7559fb
-MD5 bbed1252fc21860082cec00738288d06 pftpfxp-0.11.4.6-r2.ebuild 1445
-RMD160 a17748a5c774dcab271b202e4b42367f1d42c43f pftpfxp-0.11.4.6-r2.ebuild 1445
-SHA256 3916ecb450a7863b37ecadd4b36d93ca801214609bf9f2e5ebf9dea75d7559fb pftpfxp-0.11.4.6-r2.ebuild 1445
+EBUILD pftpfxp-0.11.4.6-r3.ebuild 1534 RMD160 037abe42a1f488cc4d36a130ed766d18144ed5f4 SHA1 c1196bfb70e4930f7608293aa13ba3a73e96a227 SHA256 55403eac9e8d12dc387c20894612bda01b4df63f31a164bda2e9ba7c63cff0fd
+MD5 e6f0d3f5eacae0aeb79002dcfeced7f6 pftpfxp-0.11.4.6-r3.ebuild 1534
+RMD160 037abe42a1f488cc4d36a130ed766d18144ed5f4 pftpfxp-0.11.4.6-r3.ebuild 1534
+SHA256 55403eac9e8d12dc387c20894612bda01b4df63f31a164bda2e9ba7c63cff0fd pftpfxp-0.11.4.6-r3.ebuild 1534
 EBUILD pftpfxp-0.11.4.6.ebuild 1258 RMD160 a6c9e96369028ce32d5447dea9b17e37ad2c15ac SHA1 86dc6212789079f3815f03dc70f54752c3df5059 SHA256 7c802d1f4eff5ccc00f17a3ab0e962038d2929e9017c7545e1a9555a0f3042d9
 MD5 89c3b02b1209866e2e9ff6e80ece28fa pftpfxp-0.11.4.6.ebuild 1258
 RMD160 a6c9e96369028ce32d5447dea9b17e37ad2c15ac pftpfxp-0.11.4.6.ebuild 1258
 SHA256 7c802d1f4eff5ccc00f17a3ab0e962038d2929e9017c7545e1a9555a0f3042d9 pftpfxp-0.11.4.6.ebuild 1258
-MISC ChangeLog 1542 RMD160 71a629b66581f29e8b685b8ee0080573951d5b20 SHA1 da341ce63bd845d204c2804b43d224096c08c4fa SHA256 27ecdd304669e09006ff16b8cd7ae2fe38c0d22bb86e12c83452f57a2f7808a6
-MD5 221c99b805d2313da6792bb609f10f7a ChangeLog 1542
-RMD160 71a629b66581f29e8b685b8ee0080573951d5b20 ChangeLog 1542
-SHA256 27ecdd304669e09006ff16b8cd7ae2fe38c0d22bb86e12c83452f57a2f7808a6 ChangeLog 1542
+MISC ChangeLog 1864 RMD160 2aac50edc2ab44a26f26f017f8ad2299762e86fc SHA1 3227e6c618255bda52415d75a57553cdd5b48fa7 SHA256 eb8e1d6f6baa279f4568ef2d2bd306c65f0751f66b065a1cc3861872445c2275
+MD5 c91902b0c39081027c6ce16e80d3ba76 ChangeLog 1864
+RMD160 2aac50edc2ab44a26f26f017f8ad2299762e86fc ChangeLog 1864
+SHA256 eb8e1d6f6baa279f4568ef2d2bd306c65f0751f66b065a1cc3861872445c2275 ChangeLog 1864
 MISC metadata.xml 403 RMD160 48afb924f8ddebfd4ea31a43eca3b277a30b62b6 SHA1 ec604212b5eb7dde6256c827184a228eaa8161d5 SHA256 148b8bb5514a7787fab372ad8a71c93c67db9ce84ed2aa5953691c2104ca788a
 MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
 RMD160 48afb924f8ddebfd4ea31a43eca3b277a30b62b6 metadata.xml 403
@@ -37,16 +37,13 @@ SHA256 148b8bb5514a7787fab372ad8a71c93c67db9ce84ed2aa5953691c2104ca788a metadata
 MD5 a06304b7f4b3c212deebbec5caeb862d files/digest-pftpfxp-0.11.4.6 250
 RMD160 bdacbfbb203505fee89a4a1be3f8a226c896214a files/digest-pftpfxp-0.11.4.6 250
 SHA256 0d729a713a6fc776933856a041d2c928a319392ff2a3fedc09e4f59870250150 files/digest-pftpfxp-0.11.4.6 250
-MD5 a06304b7f4b3c212deebbec5caeb862d files/digest-pftpfxp-0.11.4.6-r1 250
-RMD160 bdacbfbb203505fee89a4a1be3f8a226c896214a files/digest-pftpfxp-0.11.4.6-r1 250
-SHA256 0d729a713a6fc776933856a041d2c928a319392ff2a3fedc09e4f59870250150 files/digest-pftpfxp-0.11.4.6-r1 250
-MD5 a06304b7f4b3c212deebbec5caeb862d files/digest-pftpfxp-0.11.4.6-r2 250
-RMD160 bdacbfbb203505fee89a4a1be3f8a226c896214a files/digest-pftpfxp-0.11.4.6-r2 250
-SHA256 0d729a713a6fc776933856a041d2c928a319392ff2a3fedc09e4f59870250150 files/digest-pftpfxp-0.11.4.6-r2 250
+MD5 a06304b7f4b3c212deebbec5caeb862d files/digest-pftpfxp-0.11.4.6-r3 250
+RMD160 bdacbfbb203505fee89a4a1be3f8a226c896214a files/digest-pftpfxp-0.11.4.6-r3 250
+SHA256 0d729a713a6fc776933856a041d2c928a319392ff2a3fedc09e4f59870250150 files/digest-pftpfxp-0.11.4.6-r3 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFEtbtHmdTrptrqvGERAo+5AKCW/Dfo8Zgl/JtTjBw5zagCCAF5TwCfdTk7
-rZsZTJilXZ5MdEj3MG9scVc=
-=EymU
+iD8DBQFEyjLZmdTrptrqvGERAsKnAKCWUKQaelNOpT4fQBFjEcx230H5YgCeP3WE
+/SCC3/iKCx00O0GCDCvGKCI=
+=BrJD
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/pftpfxp/files/digest-pftpfxp-0.11.4.6-r1 b/net-ftp/pftpfxp/files/digest-pftpfxp-0.11.4.6-r1
deleted file mode 100644
index 923a4fd4b307..000000000000
--- a/net-ftp/pftpfxp/files/digest-pftpfxp-0.11.4.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 22528192327488a372a6de1f5d2709dc pftpfxp-v0.11.4mew6.tgz 137093
-RMD160 7d60f8cb2469d7bb95561631c05a5692dccde995 pftpfxp-v0.11.4mew6.tgz 137093
-SHA256 c119435cd844eda76631dde77104e2d0daeef44923158776927d3b51dd5b1e9b pftpfxp-v0.11.4mew6.tgz 137093
diff --git a/net-ftp/pftpfxp/files/digest-pftpfxp-0.11.4.6-r2 b/net-ftp/pftpfxp/files/digest-pftpfxp-0.11.4.6-r2
deleted file mode 100644
index 923a4fd4b307..000000000000
--- a/net-ftp/pftpfxp/files/digest-pftpfxp-0.11.4.6-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 22528192327488a372a6de1f5d2709dc pftpfxp-v0.11.4mew6.tgz 137093
-RMD160 7d60f8cb2469d7bb95561631c05a5692dccde995 pftpfxp-v0.11.4mew6.tgz 137093
-SHA256 c119435cd844eda76631dde77104e2d0daeef44923158776927d3b51dd5b1e9b pftpfxp-v0.11.4mew6.tgz 137093
diff --git a/net-ftp/pftpfxp/pftpfxp-0.11.4.6-r1.ebuild b/net-ftp/pftpfxp/pftpfxp-0.11.4.6-r1.ebuild
deleted file mode 100644
index 18a6fcdc104a..000000000000
--- a/net-ftp/pftpfxp/pftpfxp-0.11.4.6-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pftpfxp/pftpfxp-0.11.4.6-r1.ebuild,v 1.4 2006/02/24 21:48:03 dragonheart Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="The powerful curses-based ftp/fxp client, mew edition"
-HOMEPAGE="http://pftpmew.tanesha.net"
-SRC_URI="http://tanesha.net/bigmess/pftpfxp-v0.11.4mew6.tgz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="ssl"
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6c )"
-S=${WORKDIR}/pftpfxp-mew
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-gcc3.4.fix || die "patch failed"
-	epatch ${FILESDIR}/pftpfxp-v0.11.4mew6-pret.patch || die "patch failed"
-	sed -i -e "s/^CPP=.*/CPP=$(tc-getCXX)/" \
-		-e "s:^CPPF=.*:CPPF=\"-Wall -D_REENTRANT -I../include ${CFLAGS}\":" \
-		configure
-}
-
-src_compile() {
-	cd ${S}
-	#note: not a propper autoconf
-	./configure || die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin pftp
-	dodoc .pftp/config .pftp/keymap README.MEW old/*
-	cd ${WORKDIR}
-	mv irssi  mIRC-mew  pftpfxp-autoconnect ${D}/usr/share/doc/${PF}
-}
-
-pkg_postinst() {
-	einfo "In order to use pftp-mew you need to create these files:"
-	einfo "    ~/.pftp/config"
-	einfo "    ~/.pftp/keymap"
-	einfo "Refer to the examples in /usr/share/doc/${PF} for more information."
-}
diff --git a/net-ftp/pftpfxp/pftpfxp-0.11.4.6-r2.ebuild b/net-ftp/pftpfxp/pftpfxp-0.11.4.6-r2.ebuild
deleted file mode 100644
index 85133d6b9e88..000000000000
--- a/net-ftp/pftpfxp/pftpfxp-0.11.4.6-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pftpfxp/pftpfxp-0.11.4.6-r2.ebuild,v 1.1 2006/07/13 03:05:57 dragonheart Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="The powerful curses-based ftp/fxp client, mew edition"
-HOMEPAGE="http://pftpmew.tanesha.net"
-SRC_URI="http://tanesha.net/bigmess/pftpfxp-v0.11.4mew6.tgz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="ssl"
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6c )"
-S=${WORKDIR}/pftpfxp-mew
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-gcc3.4.fix || die "patch failed"
-	epatch ${FILESDIR}/pftpfxp-v0.11.4mew6-pret.patch || die "patch failed"
-	epatch ${FILESDIR}/0.11.4.6-correct_config_fix.patch || die "patch failed"
-	sed -i -e "s/^CPP=.*/CPP=$(tc-getCXX)/" \
-		-e "s:^CPPF=.*:CPPF=\"-Wall -D_REENTRANT -I../include ${CFLAGS}\":" \
-		configure
-}
-
-src_compile() {
-	cd ${S}
-	#note: not a propper autoconf
-	./configure || die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin pftp
-	dodoc .pftp/config .pftp/keymap README.MEW old/*
-	cd ${WORKDIR}
-	mv irssi  mIRC-mew  pftpfxp-autoconnect ${D}/usr/share/doc/${PF}
-}
-
-pkg_postinst() {
-	einfo "In order to use pftp-mew you need to create these files:"
-	einfo "    ~/.pftp/config"
-	einfo "    ~/.pftp/keymap"
-	einfo "Refer to the examples in /usr/share/doc/${PF} for more information."
-}