Fix issue with different repository naming between portage/paludis. Thanks to Anthony Parsons in bug #537584.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x215AD14D

4 files changed, 74 insertions, 10 deletions

diff --git a/app-portage/pfl/ChangeLog b/app-portage/pfl/ChangeLog
index 2b3bf03f7de8..ec23c47b5171 100644
--- a/app-portage/pfl/ChangeLog
+++ b/app-portage/pfl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/pfl
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/pfl/ChangeLog,v 1.72 2014/08/08 07:42:00 billie Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/pfl/ChangeLog,v 1.73 2015/04/04 11:21:10 billie Exp $
+
+*pfl-2.4-r4 (04 Apr 2015)
+
+  04 Apr 2015; Daniel Pielmeier <billie@gentoo.org> +pfl-2.4-r4.ebuild,
+  +files/pfl-2.4-reponame.patch:
+  Fix issue with different repository naming between portage/paludis. Thanks to
+  Anthony Parsons in bug #537584.
 
 *pfl-2.4-r3 (08 Aug 2014)
 
diff --git a/app-portage/pfl/Manifest b/app-portage/pfl/Manifest
index c610cc9db115..a5c6c174c162 100644
--- a/app-portage/pfl/Manifest
+++ b/app-portage/pfl/Manifest
@@ -3,18 +3,16 @@ Hash: SHA256
 
 AUX e-file-20110906-http-response.patch 356 SHA256 472ec1ed6bd3497467fd0f94add7f7dcba4cc259edd120e0ae1a55c614a5b06a SHA512 92d469ebff864e47a196db012d4b04422700b76bddbdcd03c8c2dce26015f2e354b41d4cea0e458383ca72f356843d137f3de64b78f0ddf416fb31d846dbcbab WHIRLPOOL 55fbaf1816091d3e4a4f0b534f5bf0f9e8873f3f394f57044c7991e0821280afa72ed5b5d80018d39bb1ece8665493d88f50f63dc9142dff9a4a1ebb771e4895
 AUX e-file-20110906-portageq.patch 1256 SHA256 a52b0ed637b5a3839a2310121480cf227c85dbf3d48910e6143a8524c770cbba SHA512 370f74f68888860e8b8d82ea55288c67df45e946e3fc1ff6e4a0c24a4036a045a942347c7eaee02574f7c3d66a6c5c5b3a2208a2c7457f4e7d1fed65e95466aa WHIRLPOOL 00dd91b89d4326fc7497ac0ef396afdc932c16be999050b4ddae300cfdf5afd959cff3f6c63fd0f8471dfdedb5b0521fd84b43973e4c8000c42e12de145681c0
+AUX pfl-2.4-reponame.patch 336 SHA256 04d5dfbfffa599fa85ce062654c4267c8186b6443ace02b2f544da113f0f3002 SHA512 bb1d4af5b29f070ef75cebd0374fd50556bbc38c8b7b15256c1156dae9887b6e794a0bcc35a199e4e232cae20251a7b74da614779ed589ae9f0420829a5a4659 WHIRLPOOL 8b64335b45cbabbb81d6e0102712cfd8f280f4bb49b3a76c709871983514dbdd43533b5b9308f777f30b2bd359629c8e7c8adca689591caf7d680929afa2a882
 DIST pfl-2.4.tar.bz2 6274 SHA256 7e09db7fe79a2c0cdd8faf39ff05069f5c03b5f994168ecb0395c628b8d5f297 SHA512 a33712bc38d6e02474856dc3a9eac0d39be032a9554f2510815602e94648cd6bf499111a3354568788ddcc0a653a2ac54fac56b0af03fb1cf822ec44ffcb1d72 WHIRLPOOL 3091e30199313c27b88f35563825c2add7bcee972337ef8936636342442b663d12d5ad3c178342812906476071d7224ff134eacdabbf9f7478d7823d793b128f
 EBUILD pfl-2.4-r3.ebuild 1213 SHA256 55afd2bd2d3e9f9bad4b91b0b58601c1d89052925e0c11013fb1f79983034ccb SHA512 fcf21f4f8bf8924901f93194643ad4f33553eb7f3bf673f8da87dd2b6c296fda54526fc17f5050a287da4b94cb405382d51a3780a87ec2afb912f0397538ee47 WHIRLPOOL 1fc863bf6dbfc2023540ed7115fabd98a413bfa93f01b47c2b182504aa7c77a61e0390a54437eb6ad9aa04b5a7178b8e92dd22b0746c4ca48b042cbde53044b5
-MISC ChangeLog 9014 SHA256 32a10b487ffc2b2b1ec5ee48dd6d2c4431b7b757a07c573017d6c9e28fe44e33 SHA512 0b3311f80a4970b70c117e21a6e911cc99a65218b2a416976a58766014fb36280e37d5af08bcc62a49e2c3176f0694d69bf9140ae417d06a6df6caa04b74ed47 WHIRLPOOL 00ef0e19ff775c35d6b794ebf3c25c51f6bb9f07de7a3552b916395170a34d90b1f49afaea4f10e5312e53011340104653403ac14b76fbf38bea5e1cb0b16179
+EBUILD pfl-2.4-r4.ebuild 1260 SHA256 ba2abe443e7c2f852283e0e838aede437201c8f4b39b5401206d0b5cdac35807 SHA512 de4d894ee11387ed6da36a84361997358ad87579cd0b0a0a678abae9b0478216f504914ce7d7fa55c8613f219177498b640567087875c7a3b4f2c4d06cfb4142 WHIRLPOOL f759c22e007a9ecd1fe2cdec9aeef665e765001d41a2585164f60e92597d8c53cd8df7c48420fb49f2ef27eaec2b1118b3d9c67fcb8e74cbcafa1e436440b605
+MISC ChangeLog 9261 SHA256 1bbb8d7680d58eac944b03aac6fb3a3dae2dcc5675e795a28a18cad6cd30142e SHA512 5981e88a0a6f455f63b6efe6957e9eee635cff8a0adb5591f93962995a396ce6aa626a8d182963d90b06b1baebabed549929c42b733699cc29ae347b3794c3d8 WHIRLPOOL 5d685c5387f1b74920c69fbb77e95a2a9e50c0bf533ef38dce378c5e6c3642765f4de64ea621b576926a025898d33c24ed11c81dc43293f52864947d7f63fd59
 MISC metadata.xml 515 SHA256 749b45b87e5c0f2c5cd4c8a23e6ff65cffa426516ab99da0f0e96ae2575ca3b7 SHA512 6fb02ae546328199365df72937302b96fdb758c78219ae1ef1f484bdb0ae93d20c274af53e5cf0477c9ea3029199e6e7f7c919d3641d3c80b9ee03c76e70c30c WHIRLPOOL b5c98ed9ec81a55c43bdd085c5589075c8cb5c0d41a4f3036ccb07b4a07c883b631c9c02605cc1eb0121b3b242266bb1a79dc6015a377356df2737fad27e0226
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT5N/jAAoJEE4V4vFnx44dg14H/24WYXljye7nV1VJ4zr8LqCO
-wCxqU9kfTxkezTVernB51bap4TkNbIa29mX+tgjxk1oKcrR7Rw+HTsJWeeLEC/4R
-+0AoQJZGN4MGusk8gx49VP0bRDAgcP4YrTcf8P+lm6/zM9/zSkJhjWiVIfsx0oWY
-JhWLtftQYZV05JOnuSpToYVoJRFMfiXQoXShPkbbngGy51E8Xoh64ApU5yiNTbU0
-T1YXXjDl+7bTlbWcYl+6gv25mJWfJ3y3nnrnxeL8efOg0EXcpTpJbmvm8YsyAGZK
-ghPF5pEyDmlppyDpfvw9JD8z0NrqZFwHfbmN4kw96O9B+vI+VppGVNNg25WuRlo=
-=RjkH
+iEYEAREIAAYFAlUfyScACgkQlcuUeyFa0U2B2QCfR4DyIbiFDkUfUXj0NcQbBZfs
+SxwAoNN2bp24gMB63eFyqKRCD+voK8aw
+=Alhi
 -----END PGP SIGNATURE-----
diff --git a/app-portage/pfl/files/pfl-2.4-reponame.patch b/app-portage/pfl/files/pfl-2.4-reponame.patch
new file mode 100644
index 000000000000..a9041d46b329
--- /dev/null
+++ b/app-portage/pfl/files/pfl-2.4-reponame.patch
@@ -0,0 +1,11 @@
+--- pfl/pfl.py	(Revision 68)
++++ pfl/pfl.py	(Arbeitskopie)
+@@ -226,6 +226,8 @@
+ 				v = '%s-%s' % (v, r)
+ 				
+ 			repo, = self._vardbapi.aux_get(cpv, ['repository'])
++			if len(repo) == 0:
++				repo, = self._vardbapi.aux_get(cpv, ['REPOSITORY'])
+ 
+ 			# timestamp of merge
+ 			mergedstamp = self._vardbapi.aux_get(cpv, ['_mtime_'])[0]
diff --git a/app-portage/pfl/pfl-2.4-r4.ebuild b/app-portage/pfl/pfl-2.4-r4.ebuild
new file mode 100644
index 000000000000..7c868ed970a5
--- /dev/null
+++ b/app-portage/pfl/pfl-2.4-r4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/pfl/pfl-2.4-r4.ebuild,v 1.1 2015/04/04 11:21:10 billie Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils distutils-r1
+
+DESCRIPTION="Searchable online file/package database for Gentoo"
+HOMEPAGE="http://www.portagefilelist.de"
+SRC_URI="http://files.portagefilelist.de/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-fbsd ~x64-freebsd ~amd64-linux ~x86-linux"
+IUSE="+network-cron"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	net-misc/curl
+	sys-apps/portage[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	epatch "${FILESDIR}"/e-file-20110906-http-response.patch \
+		"${FILESDIR}"/e-file-20110906-portageq.patch \
+		"${FILESDIR}"/pfl-2.4-reponame.patch
+}
+
+python_install_all() {
+	if use network-cron ; then
+		exeinto /etc/cron.weekly
+		doexe cron/pfl
+	fi
+
+	keepdir /var/lib/${PN}
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EROOT%/}/var/lib/${PN}/pfl.info" ]]; then
+		touch "${EROOT%/}/var/lib/${PN}/pfl.info" || die
+		chown -R 0:portage "${EROOT%/}/var/lib/${PN}" || die
+		chmod 775 "${EROOT%/}/var/lib/${PN}" || die
+	fi
+}