diff options
| author |   Marcelo Góes <vanquirius@gentoo.org> | 2006-01-19 23:08:38 +0000 |
|---|---|---|
| committer | Marcelo Góes <vanquirius@gentoo.org> | 2006-01-19 23:08:38 +0000 |
| commit | 95cd7e29a6d7ad09a244e66ea5b179be510407b1 (patch) | |
| tree | a7f9811e2848bf56861739b744f35a2378178115 /net-print | |
| parent | add back in patch that wasnt supposed to be cut [yet] #119571 (diff) | |
| download | gentoo-2-95cd7e29a6d7ad09a244e66ea5b179be510407b1.tar.gz gentoo-2-95cd7e29a6d7ad09a244e66ea5b179be510407b1.tar.bz2 gentoo-2-95cd7e29a6d7ad09a244e66ea5b179be510407b1.zip | |
Fix file collision with foomatic-filters.
(Portage version: 2.0.54)
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/foomatic-db/ChangeLog | 8 | ||||
| -rw-r--r-- | net-print/foomatic-db/Manifest | 12 | ||||
| -rw-r--r-- | net-print/foomatic-db/foomatic-db-20050910.ebuild | 7 |
3 files changed, 17 insertions, 10 deletions
diff --git a/net-print/foomatic-db/ChangeLog b/net-print/foomatic-db/ChangeLog index 338528644e38..28ceb6d41494 100644 --- a/net-print/foomatic-db/ChangeLog +++ b/net-print/foomatic-db/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-print/foomatic-db -# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/ChangeLog,v 1.38 2005/09/16 04:48:41 agriffis Exp $ +# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/ChangeLog,v 1.39 2006/01/19 23:08:38 vanquirius Exp $ + + 19 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> + foomatic-db-20050910.ebuild: + Fix file collision with foomatic-filters. 15 Sep 2005; Aron Griffis <agriffis@gentoo.org> foomatic-db-20050606.ebuild: diff --git a/net-print/foomatic-db/Manifest b/net-print/foomatic-db/Manifest index c16710d7b39f..c0adb0548290 100644 --- a/net-print/foomatic-db/Manifest +++ b/net-print/foomatic-db/Manifest @@ -1,9 +1,9 @@ -MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 MD5 416c9c608cd427f378feae4414b4b436 ChangeLog 4971 -MD5 2cda4990fe3c390950014cc257fa29d6 foomatic-db-20041220.ebuild 1416 -MD5 952e9ac5ead1aa3dece394514a250521 foomatic-db-20050606.ebuild 1420 -MD5 7a53bbcb865c2325064f499de2a20bf1 foomatic-db-20050910.ebuild 1516 -MD5 54c0bfaa8f9d493b503201550f2fef16 files/digest-foomatic-db-20050910 160 MD5 41ff1e00ded5cca40749e4b960e1f1f1 files/digest-foomatic-db-20041220 155 -MD5 3b52f0bdaf63cd7b1fd928837604b4d1 files/fix-sandbox-20050910.patch 327 MD5 e7cfdb3e785bbdd23884cdc735f1742f files/digest-foomatic-db-20050606 155 +MD5 54c0bfaa8f9d493b503201550f2fef16 files/digest-foomatic-db-20050910 160 +MD5 3b52f0bdaf63cd7b1fd928837604b4d1 files/fix-sandbox-20050910.patch 327 +MD5 2cda4990fe3c390950014cc257fa29d6 foomatic-db-20041220.ebuild 1416 +MD5 952e9ac5ead1aa3dece394514a250521 foomatic-db-20050606.ebuild 1420 +MD5 b422b79fda3063c00398f6f5fdd22da4 foomatic-db-20050910.ebuild 1657 +MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 diff --git a/net-print/foomatic-db/foomatic-db-20050910.ebuild b/net-print/foomatic-db/foomatic-db-20050910.ebuild index 7df325a3104a..5d2dd9d9de2f 100644 --- a/net-print/foomatic-db/foomatic-db-20050910.ebuild +++ b/net-print/foomatic-db/foomatic-db-20050910.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/foomatic-db-20050910.ebuild,v 1.3 2005/09/11 07:13:27 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/foomatic-db-20050910.ebuild,v 1.4 2006/01/19 23:08:38 vanquirius Exp $ inherit eutils @@ -35,6 +35,9 @@ src_compile() { cd ../foomatic-filters-ppds-${PV} rm -f `find . -name "*gimp-print*" ` rm -f `find . -name "*hpijs*" ` + # conflicts with foomatic-filters + rm -f bin/{foomatic-gswrapper,foomatic-rip} + rm -f share/man/man1/{foomatic-gswrapper,foomatic-rip}.1 fi } |