epm-1.31 incorrectly reported directories leading up to an object. This does

not match rpm behavior. Instead, epm should report directory ownership when
a .keep* file exists for the package
(Portage version: 2.1.1_pre5-r2)
 (Signed Manifest commit)

3 files changed, 17 insertions, 43 deletions

diff --git a/app-portage/epm/Manifest b/app-portage/epm/Manifest
index e465e806c6d3..f36e27fe4e7a 100644
--- a/app-portage/epm/Manifest
+++ b/app-portage/epm/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST epm-0.9.1.tar.gz 10439 RMD160 7ced7a34b0921a0556367652c044f0e7e46e0746 SHA256 351f07029ddb9924095d1c0e197761a8636983f6e5de99df50f4b96e4c1b8289
-DIST epm-1.31.tar.gz 10835 RMD160 dc58713abc4df11ff12863560bc64d22adff3a14 SHA1 4def970885c7fe8b5d3ffaeff1cd6158e3dee2bc SHA256 46cc0e9e78a47a8c66c2474320d013724ad9347f48b7cd4959134e43b4e24ef7
+DIST epm-0.9.1.tar.gz 10439 RMD160 7ced7a34b0921a0556367652c044f0e7e46e0746 SHA1 9779014517813259b550e8937df19acb9d626c75 SHA256 351f07029ddb9924095d1c0e197761a8636983f6e5de99df50f4b96e4c1b8289
+DIST epm-1.33.tar.gz 10952 RMD160 a20d655276c97540ad41a3c20c5548352a2df75b SHA1 db2637a2abec3ac110cf5f2f50555baa04138e04 SHA256 058c839a6aa0c63939d9cbecf81e589cd7c8ff8b13dc3e15ccd313caaa2ea19c
 EBUILD epm-0.9.1.ebuild 621 RMD160 8135515d0fabc82a5a49a7942563495d7cdc883c SHA1 e68fcf7e8179166ea1260cec353e94e76c0911ac SHA256 c1978b0ed387799229ba735644c7e426b958aae3aac2bfe2fb4bb10b937c7041
 MD5 e80337be99abeede705796dcb7c9f761 epm-0.9.1.ebuild 621
 RMD160 8135515d0fabc82a5a49a7942563495d7cdc883c epm-0.9.1.ebuild 621
 SHA256 c1978b0ed387799229ba735644c7e426b958aae3aac2bfe2fb4bb10b937c7041 epm-0.9.1.ebuild 621
-EBUILD epm-1.31.ebuild 632 RMD160 5f5221f01e1631fce666d1cfec54c723ef0efa86 SHA1 e19ab4f8ef09ba0244648f371526ed732d12fd68 SHA256 4fba57ead4b32c22ad508c90e9a0c7d37a6138f731cc18f0d9eb1b9916787dc6
-MD5 9468d13e2ee262748b099c1324047d6c epm-1.31.ebuild 632
-RMD160 5f5221f01e1631fce666d1cfec54c723ef0efa86 epm-1.31.ebuild 632
-SHA256 4fba57ead4b32c22ad508c90e9a0c7d37a6138f731cc18f0d9eb1b9916787dc6 epm-1.31.ebuild 632
-MISC ChangeLog 4317 RMD160 65d4086655ed11a969056f675493d045535f5c23 SHA1 c10581a20b59b7d32d1a15edd785009559476119 SHA256 58b346193d48e0273645af872ab7abcb4b23409a4b97be1799f0526c68f5773c
-MD5 087b71caa4404b978d3c9394e4b47db4 ChangeLog 4317
-RMD160 65d4086655ed11a969056f675493d045535f5c23 ChangeLog 4317
-SHA256 58b346193d48e0273645af872ab7abcb4b23409a4b97be1799f0526c68f5773c ChangeLog 4317
+EBUILD epm-1.33.ebuild 632 RMD160 a8f3c11cc29d5940d1154148ce9e9207d21f0e69 SHA1 20209341eaa6da4c5bbc8bbe588e15ca8ef240de SHA256 cc5b7aac008e46e2b644b5a2def815a899d22138e289a61d1f0e5f4e7eab204c
+MD5 ea8b63c009dfff88001a8217d7a0c4da epm-1.33.ebuild 632
+RMD160 a8f3c11cc29d5940d1154148ce9e9207d21f0e69 epm-1.33.ebuild 632
+SHA256 cc5b7aac008e46e2b644b5a2def815a899d22138e289a61d1f0e5f4e7eab204c epm-1.33.ebuild 632
+MISC ChangeLog 4627 RMD160 189496cf812f4f59e2ec8a9658b37668ea1f90fb SHA1 d55798fd4772fa37442fe34dff92ffdcfbeca26e SHA256 17a7220fa8fab6c9e6a3d37ace2ac994db2d9343e4245a209dc25bf4ba80547c
+MD5 6556890949b57081986dd3d4ab2d5f18 ChangeLog 4627
+RMD160 189496cf812f4f59e2ec8a9658b37668ea1f90fb ChangeLog 4627
+SHA256 17a7220fa8fab6c9e6a3d37ace2ac994db2d9343e4245a209dc25bf4ba80547c ChangeLog 4627
 MISC metadata.xml 347 RMD160 d8167c3ed47da724c49a15976e094673a7ef84e2 SHA1 d848edde601cbdcbfcef6a503f804ce4ef07ebbc SHA256 d75ea3b4d0ff0d5ca756e46902698701dd7f9814927bdf1f2b3a4f05bb194187
 MD5 fd734d385c097a936c63336d85f19beb metadata.xml 347
 RMD160 d8167c3ed47da724c49a15976e094673a7ef84e2 metadata.xml 347
@@ -22,13 +22,13 @@ SHA256 d75ea3b4d0ff0d5ca756e46902698701dd7f9814927bdf1f2b3a4f05bb194187 metadata
 MD5 c3a5579024313155f3a478c665aff3fe files/digest-epm-0.9.1 226
 RMD160 b3217251ae22d45ff145b58ac8c0e559ceb0ad41 files/digest-epm-0.9.1 226
 SHA256 c5f4655da841a86dc2490f6633fe433015d2fe1a981fecdf05092c2b68286e25 files/digest-epm-0.9.1 226
-MD5 2025002ec5836741d441ddf95bc722d9 files/digest-epm-1.31 223
-RMD160 322388c96f29a2f2e868edded5d70433b42acb67 files/digest-epm-1.31 223
-SHA256 9eaf27c689d49539e9f3aca26c6a837fbf3af61b1c28e5e5858c51bc91b80408 files/digest-epm-1.31 223
+MD5 0008aa953cf8cf18d5f0468743add32e files/digest-epm-1.33 223
+RMD160 78c248ec6ddfc2cdd7038c46106e4d74cfa784e0 files/digest-epm-1.33 223
+SHA256 35e1a4b69b1301e8030c78a839cac8d0721c302edd4906ef9ac7b00ac691566a files/digest-epm-1.33 223
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFAcyYJrHF4yAQTrARAtv2AJ9KJQEj3kVFJT6wJyZuCnWcl0iW1gCfQCJ4
-Iy8tUDy6BrN8iQMSDyYlldw=
-=LvXh
+iD8DBQFFCCA5JrHF4yAQTrARAgnPAJ0ZiNF22f1K3/sj5nZNeEbHMrFKKwCgyjBx
+AFFmu0SGQbg/dMwbz23TR2U=
+=K4JR
 -----END PGP SIGNATURE-----
diff --git a/app-portage/epm/epm-1.31.ebuild b/app-portage/epm/epm-1.31.ebuild
deleted file mode 100644
index c08dba8c6436..000000000000
--- a/app-portage/epm/epm-1.31.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/epm/epm-1.31.ebuild,v 1.1 2006/09/08 19:41:37 agriffis Exp $
-
-DESCRIPTION="rpm workalike for Gentoo Linux"
-HOMEPAGE="http://www.gentoo.org/~agriffis/epm/"
-SRC_URI="http://www.gentoo.org/~agriffis/epm/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5"
-
-src_compile() {
-	pod2man epm > epm.1 || die "pod2man failed"
-}
-
-src_install() {
-	dobin epm || die
-	doman epm.1
-}
diff --git a/app-portage/epm/files/digest-epm-1.31 b/app-portage/epm/files/digest-epm-1.31
deleted file mode 100644
index 5544c133c188..000000000000
--- a/app-portage/epm/files/digest-epm-1.31
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d75e375626baae8a8e746730438fee59 epm-1.31.tar.gz 10835
-RMD160 dc58713abc4df11ff12863560bc64d22adff3a14 epm-1.31.tar.gz 10835
-SHA256 46cc0e9e78a47a8c66c2474320d013724ad9347f48b7cd4959134e43b4e24ef7 epm-1.31.tar.gz 10835