From: Timothy Redaelli Date: Thu, 11 Jan 2007 21:59:55 +0000 (+0000) Subject: Remove pbm manpage, it collides with netpbm X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e5bfdfb25d47c5c03cd22113f79a6081c24c98dc;p=gentoo.git Remove pbm manpage, it collides with netpbm Package-Manager: portage-2.1.2_rc4-r6 --- diff --git a/sys-freebsd/freebsd-share/ChangeLog b/sys-freebsd/freebsd-share/ChangeLog index 78428f5ce0de..c32d94a8e916 100644 --- a/sys-freebsd/freebsd-share/ChangeLog +++ b/sys-freebsd/freebsd-share/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-freebsd/freebsd-share # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.24 2007/01/05 21:30:53 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.25 2007/01/11 21:59:55 drizzt Exp $ + + 11 Jan 2007; Timothy Redaelli + freebsd-share-6.2_rc2.ebuild: + Remove pbm manpage, it collides with netpbm 05 Jan 2007; Diego Pettenò -files/freebsd-share-6.0-links.patch, -files/freebsd-share-6.1-utf8.patch, diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest index 2ec3acf81aae..266b84e04519 100644 --- a/sys-freebsd/freebsd-share/Manifest +++ b/sys-freebsd/freebsd-share/Manifest @@ -18,14 +18,14 @@ DIST freebsd-sbin-6.2_rc2.tar.bz2 1161795 RMD160 85e47cda22e8e5d8eff1b08abeafdbd DIST freebsd-share-6.2_rc2.tar.bz2 3762566 RMD160 d7e8392c49cd1b5f0989a1b87144cc799ae418fa SHA1 0858ea37090fceffb8d9893b38174f803fa7f544 SHA256 bff220ae3d7ab346494e339270a1c7f173593541db05fd102a1c6e8ef52fdda3 DIST freebsd-ubin-6.2_rc2.tar.bz2 1773409 RMD160 be5fa09f2b84b77981ba6ae34d2c237b05164776 SHA1 6052972c318830a717cb3f6b72fe034c1a1fe147 SHA256 391d266053323b96a258a264abec848bd0799ded76dcad098b510bd5d9a75398 DIST freebsd-usbin-6.2_rc2.tar.bz2 2696638 RMD160 c907088555c4bba3e4542f69649f6df9dba4fc8a SHA1 b5d65f1d02bcb4fc0aae3649a6b0699b11aee820 SHA256 952f3d8638035b31e65e4374139f49b993b55b88fbbe62ce0dead963ac552b25 -EBUILD freebsd-share-6.2_rc2.ebuild 2033 RMD160 9b81df4236543df17740a0e8421d118c2c56e2dc SHA1 0754a56f54fc346489069cc6dce73bac15d514f1 SHA256 e5c95b735d1430e40bdbe00d38511d3ebf6c976a81c6a9a7e066beb2c133811e -MD5 83017dcb90d4befa28d1dc40ea3ffd47 freebsd-share-6.2_rc2.ebuild 2033 -RMD160 9b81df4236543df17740a0e8421d118c2c56e2dc freebsd-share-6.2_rc2.ebuild 2033 -SHA256 e5c95b735d1430e40bdbe00d38511d3ebf6c976a81c6a9a7e066beb2c133811e freebsd-share-6.2_rc2.ebuild 2033 -MISC ChangeLog 5432 RMD160 51a0ace7faae3661ef35f7dea48a1a8400ba3cd9 SHA1 40c3d131c2c25d076d3b511244c439904907640a SHA256 1166d931ab6f280e1392291e845a4455fe7ea7777a55000e3fbbd295e319665f -MD5 1fb8cc4c6737168e44a8a8b8960ef55d ChangeLog 5432 -RMD160 51a0ace7faae3661ef35f7dea48a1a8400ba3cd9 ChangeLog 5432 -SHA256 1166d931ab6f280e1392291e845a4455fe7ea7777a55000e3fbbd295e319665f ChangeLog 5432 +EBUILD freebsd-share-6.2_rc2.ebuild 2100 RMD160 61c2a435a12a9d3571f42d756217305367e516ee SHA1 50a70d84705bdb9931840f4265d59afe30830fc9 SHA256 0386cc735cd8c5b905cc018cefb82aec3591011d75a03aa2b387efd863b5d87f +MD5 096016445600d80058d7d03aa60c76e5 freebsd-share-6.2_rc2.ebuild 2100 +RMD160 61c2a435a12a9d3571f42d756217305367e516ee freebsd-share-6.2_rc2.ebuild 2100 +SHA256 0386cc735cd8c5b905cc018cefb82aec3591011d75a03aa2b387efd863b5d87f freebsd-share-6.2_rc2.ebuild 2100 +MISC ChangeLog 5560 RMD160 b84f412c94814dc386d3f68b500479e1e91a6683 SHA1 304441e1132f3f853f7ea467b4f5d6a0928f741a SHA256 2d52bd9bae9a3345130c2519d2b9a35d31005d42ae04f9c1ef83f5064bd18ad8 +MD5 06c38117508ea562a8fd5f8462d0732d ChangeLog 5560 +RMD160 b84f412c94814dc386d3f68b500479e1e91a6683 ChangeLog 5560 +SHA256 2d52bd9bae9a3345130c2519d2b9a35d31005d42ae04f9c1ef83f5064bd18ad8 ChangeLog 5560 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156 @@ -36,7 +36,7 @@ SHA256 7abc20ca7d35fef3a31c458a58eacb5661de939fe3db0ec2fca10f0e739ff637 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFnsOeAiZjviIA2XgRArogAJ482NIbGY+RF5CJ4bMqXNPAYcvUiQCg1bTs -GlRVNWYefnCbf+Uj3ba5V10= -=6I2Q +iD8DBQFFprNiGDyatLGpTbYRAoTUAJ9vqzXf6L85A7Mrl3bkGl8ygsL0YwCdH/wp +zaPOVVFXXNIM+uRz+s85nKY= +=y+s9 -----END PGP SIGNATURE----- diff --git a/sys-freebsd/freebsd-share/freebsd-share-6.2_rc2.ebuild b/sys-freebsd/freebsd-share/freebsd-share-6.2_rc2.ebuild index 1a4cb648ed4e..8795daf9c428 100644 --- a/sys-freebsd/freebsd-share/freebsd-share-6.2_rc2.ebuild +++ b/sys-freebsd/freebsd-share/freebsd-share-6.2_rc2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-6.2_rc2.ebuild,v 1.1 2006/12/29 15:20:44 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-6.2_rc2.ebuild,v 1.2 2007/01/11 21:59:55 drizzt Exp $ inherit bsdmk freebsd @@ -46,6 +46,8 @@ src_unpack() { sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile" # Remove mailer.conf manpage sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile" + # Remove pbm manpage + sed -i -e 's:pbm.5::' "${S}/man/man5/Makefile" # Don't install the arch-specific directories in subdirectories sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{alpha,i386,sparc64}/Makefile