Remove duplicate files, bug 399623

Package-Manager: portage-2.1.10.45/cvs/Linux x86_64

3 files changed, 36 insertions, 4 deletions

diff --git a/net-print/foomatic-db-ppds/ChangeLog b/net-print/foomatic-db-ppds/ChangeLog
index 73a44a4bef16..fa037068a1ff 100644
--- a/net-print/foomatic-db-ppds/ChangeLog
+++ b/net-print/foomatic-db-ppds/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/foomatic-db-ppds
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-ppds/ChangeLog,v 1.23 2012/02/06 19:46:46 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-ppds/ChangeLog,v 1.24 2012/02/07 15:26:25 dilfridge Exp $
+
+*foomatic-db-ppds-4.0.20120117-r1 (07 Feb 2012)
+
+  07 Feb 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -foomatic-db-ppds-4.0.20120117.ebuild,
+  +foomatic-db-ppds-4.0.20120117-r1.ebuild:
+  Remove duplicate files, bug 399623
 
   06 Feb 2012; Brent Baude <ranger@gentoo.org>
   foomatic-db-ppds-4.0.20110506.ebuild:
diff --git a/net-print/foomatic-db-ppds/Manifest b/net-print/foomatic-db-ppds/Manifest
index 369b09210fd6..b56c0f6218db 100644
--- a/net-print/foomatic-db-ppds/Manifest
+++ b/net-print/foomatic-db-ppds/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX Makefile.in-20070508.patch 1168 RMD160 d17a30ed722c9608b63635acc8a18074d3422d92 SHA1 85d2099be96e6b5d8d80e847e5f420389386d221 SHA256 3ee3cb908c4b4b223b8ed7591e0a0c9c9056623964b19f498599dca97f351b3c
 AUX Makefile.in-4.0.20120117.patch 1161 RMD160 01dfecbf03a80c1f336cb029f70a2e262f56bedd SHA1 82dc5dc65d1be7397e05b712abdfaf956438f509 SHA256 c3a14472d37879572fd9373fb1605812988231b13a61d90e4bf8fdc4301a4545
 DIST foomatic-db-3.0-20060720.tar.gz 12345043 RMD160 0cf48903e617ebc5725f9ed42bf1ec8ffb155a0c SHA1 87558c3ad2f0c6b52ba7b3d1696d8a6d18f98470 SHA256 28ff1433b9719595caf3f722db166ab8e0e2e6c57184762541dab564bc5bc295
@@ -9,6 +12,23 @@ EBUILD foomatic-db-ppds-3.0.20060720.ebuild 1026 RMD160 4d2bf4b53146f0f6d498372b
 EBUILD foomatic-db-ppds-4.0.20100218.ebuild 1010 RMD160 bbaa167f9d41a9df19653e09728ed06ec3e27a30 SHA1 8e49ebd3bf18e0e451cd9d35be19a7737747694e SHA256 0b2feefbd72308f162e8328edf9de8f8138ef1d9c87effedfa44cb28ac674cab
 EBUILD foomatic-db-ppds-4.0.20101123.ebuild 1010 RMD160 10fce69885c1e6b51f578bb5a899ade2ba41b7ed SHA1 df5953c7396d869c311752401b5472048fb7d48e SHA256 7d9f3cfb908692194c986c66e1f0d32d036643053241306bd7ae29b98ec82865
 EBUILD foomatic-db-ppds-4.0.20110506.ebuild 860 RMD160 7d7b93df9df9c283a42abf3fdca618a5ee832e21 SHA1 0154dc66bd20c0d272e59756101dbb327334f80a SHA256 2f9b3501699c92d880def502d791efdcb210e099972914513063bd38c95100a1
-EBUILD foomatic-db-ppds-4.0.20120117.ebuild 853 RMD160 731fce11c151abf3a2cb26a0d7a8645afb685dcc SHA1 e8747d8e269ef8ec24f6e8c3bd59a1810c58b9b9 SHA256 16b34546dfa5c54392c6310777d23fe3cf5022b3fbebda745d6687b70335863f
-MISC ChangeLog 3895 RMD160 a64216c3c9adbb3d68ea802429a9b6a9656e8b1a SHA1 9f795433fb6a5fd7f76fbd8ec292379fecac4108 SHA256 fe69d87db5aa146aa51d04d72ad1bbefe63ce7c68d61c2ca5b50f08d3651afc8
+EBUILD foomatic-db-ppds-4.0.20120117-r1.ebuild 1001 RMD160 88d58ac298ef7f07a548ebace32c70c5884b16d9 SHA1 5c2da22980ac786f3c4982cadcfb0f201afcc214 SHA256 398aea5ad7a67e93e4d358d0bc45113e00d564b617af5542319ef02f2b2dfeb7
+MISC ChangeLog 4127 RMD160 28b5529d4009bdbcaa1265bbf0760a83a83d9f30 SHA1 ce7182969e1b796f6310423f40ddf5a90ef938ff SHA256 5d3a9b91c849418156af9e2450dcd118f4b74047b728d053bb3d6cf6d374c7ae
 MISC metadata.xml 162 RMD160 145aada347c27fc879828b9bb22ff79f4e23325c SHA1 97a164202fb2c7165cdbd9721ea05b4ac2724035 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJPMULFAAoJEEb+UGWnxTyHsJ4P/2ZCLIrlNKOCJWrpSRF89ga2
+tFFLQtrfOZzWfS2TCFc6Ca4+Rg/xaaHpGAN6r+BooQEBCGVJpu++7+bPaBLx8FS/
+BbhmpaZDs/isHSbG/TNtrX0Ok0BmXYuIJllPiy+7ld9/hSPAwJZdFXJ9sBBJm7pU
+VMC52Yhv6uoEFzcEltdrq/4KFcYIWD/VR0EFENkOwcLn6swhcQVo5srohyGwxzZ7
+PMb87AdMsH0rpcD1nYl8cuJVFoIz0SqqM8RtSXiF8rv8k9YmZlGWis/V8sbEopyy
+LrYyeqb34EsdycqR1StdED5GdksxsiH8q23P5d3bOIKWv+XOevX4XuLU1wa4zSc9
+grV3ajnqjWyjTyy98h7k8fee7jf9B4RJlpf84ErcB1TALiNWR58S6L5QFuU94rpE
+sjLYxFnpqWoI0EoMdhmwtIZ6B7rxpm2z+nvl+uUV6cKD68LS8wXUR8ua3786B4t0
+caVJjXhrcgqVVf8nZ51vz8qzmvuac95A4QOPojvQGmP0EmXhtHZ5FrIzG4ZixvcO
+ZqotCclI5BFMq4GApXjGotEnL3VBIoqoCTTqTfqeif54MpZqdo13T/8YLARQ3Ryv
+ongHwGg2RRqbVrErvSGKQX0Iqe/+wSbzA15uhyLxU614GmDCL8h4jTMWupxZQs+G
+B/vR6+Jdvt7VypMMo30c
+=Gnw5
+-----END PGP SIGNATURE-----
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20120117.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20120117-r1.ebuild
index bc6c4ab03165..14dfee6f8eb4 100644
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20120117.ebuild
+++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20120117-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20120117.ebuild,v 1.1 2012/01/17 13:48:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20120117-r1.ebuild,v 1.1 2012/02/07 15:26:25 dilfridge Exp $
 
 EAPI=4
 
@@ -24,3 +24,8 @@ S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
 src_prepare() {
 	epatch "${FILESDIR}/Makefile.in-${PV}.patch"
 }
+
+src_install() {
+	default
+	rm -v "${ED}"/usr/share/foomatic/xmlschema/{driver,option,printer,types}.xsd || die "Cannot remove duplicates"
+}