diff options
| -rw-r--r-- | net-print/hplip/ChangeLog | 5 | ||||
| -rw-r--r-- | net-print/hplip/Manifest | 10 | ||||
| -rw-r--r-- | net-print/hplip/hplip-3.11.10-r1.ebuild | 12 |
3 files changed, 16 insertions, 11 deletions
diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog index 9d495bbf7cae..453a56813d31 100644 --- a/net-print/hplip/ChangeLog +++ b/net-print/hplip/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-print/hplip # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.197 2011/11/01 12:37:10 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.198 2011/11/01 15:13:51 billie Exp $ + + 01 Nov 2011; Daniel Pielmeier <billie@gentoo.org> hplip-3.11.10-r1.ebuild: + Switch to EAPI 4. Remove Copyright files. *hplip-3.11.10-r1 (01 Nov 2011) diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest index e02b2893c93a..e7d303c96e70 100644 --- a/net-print/hplip/Manifest +++ b/net-print/hplip/Manifest @@ -14,16 +14,16 @@ AUX hplip-3.9.12-systray.patch 795 RMD160 23a37fb76a05aa9f835dfef7ee00cf70366f95 DIST hplip-3.11.10.tar.gz 21419965 RMD160 d5e7bd065f1fea5f536b4bf47c8962374de95591 SHA1 716dea09c1570356b359e5b6d4a50f8b2654d760 SHA256 1d84fd0e8cf27771b11efa05692e8764fdd758b544df60f23f0c274afea9af81 DIST hplip-3.11.5.tar.gz 21227642 RMD160 8a87f201aac95253d0ac1765e21aa094f11389f8 SHA1 e3604752b7a1ab0f492a1b4d470f8fa75e8959e5 SHA256 611f677fc1a0d2d493d44bfe84e5e5aaac4124627e94885f57bc77db9178536c DIST hplip-3.11.7.tar.gz 21286283 RMD160 aa95d10384689d563ebc8eef151faa5d5b2a3c7a SHA1 82a41c3089392ab096a5d373ce8610ff50b004b2 SHA256 820d73bad6dbd8df774e1e234eb27cae9a6e797466e2261c75db51ba38e4001d -EBUILD hplip-3.11.10-r1.ebuild 7579 RMD160 5a2a50a87e2c958004631ce51b730f7f2f8791e2 SHA1 8f328dd631aafa0c39f6782ca3967fe73952a3df SHA256 81f8eb7e8b51f70e0f1addb7b8f2539ec7e80c349fb149a78a88a730f6249102 +EBUILD hplip-3.11.10-r1.ebuild 7644 RMD160 bd809e741c3a2d9ddc7c9f233d22036d017981e5 SHA1 910829d9607ff9eceae2a79fba8928498635dfaa SHA256 8cdb521901e73cdcf3a8e33e7fa1cb199bedb95bcbb94aeae47e052d99ea3410 EBUILD hplip-3.11.10.ebuild 7523 RMD160 832907423a26f168e03c71a669c6fdda4a8d4dfb SHA1 c5a68ffab91f6f9d63c699ef15a4ace142c7f225 SHA256 c3da58011743cfbea11f3bc21aa11685d42fc3b2d060db8603113a971bb46525 EBUILD hplip-3.11.5.ebuild 7517 RMD160 4ae37df100c2990de5b4da29684eee5ef677a5f5 SHA1 dc9f869e81014b7778e4c6aadcbaf82dc6434a5e SHA256 b3eaf951652f14975d7ba12fc16e1bd9198db86aee40e0c78624f25df658ce34 EBUILD hplip-3.11.7.ebuild 7591 RMD160 a6a83cd0df0fa9b441a9c9468e0f87c016e4297b SHA1 7e4ddafa51a267ed58f7ab2fbe0a0c92500bebfe SHA256 ba5f5759b5c24543d5f8fb71e7912a766103eb1ce174e6e9a358014db1b49410 -MISC ChangeLog 34089 RMD160 7d6938ed78cb0a4c0b5ec7418ee4bb309ee29d62 SHA1 1110d3723f1367f5f5b8c55302878843a2ca8627 SHA256 57dcf3242d9e14af3b69f8fa68bffbdfb67ed2afeff2b0296b46797d3dbef2a1 +MISC ChangeLog 34211 RMD160 1871c76fbc21aa6d354e975cbadfe76558406ca9 SHA1 ab1648654ffdca32867efab66edd30a142ab603c SHA256 fbb2f328001be25b591daa6a4a4fe9a6242a3e22c72d8fa11a226d51424adf72 MISC metadata.xml 1806 RMD160 e707e0dfafb5138991bd381897b2cfdc101592e6 SHA1 7b62985602d07602626bc27078eec3744935cb29 SHA256 351d1d208236544a9a693902bcbcf16e32640f9e049ea0b2326dc1f1a13ad8bc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEAREIAAYFAk6v6AMACgkQlcuUeyFa0U3EhwCgjhKQ1FvC40YqW5mBEPRWDppJ -ewkAn2YI1ek6MVrCu7QdkRXu1Qimdyck -=k/PK +iEYEAREIAAYFAk6wDLsACgkQlcuUeyFa0U2k4gCfVOHM8Pi8XQiCVCso1SoB+p7K +LMsAoMNuFUWFcoj0vScEUBydaEiF4GNI +=49FC -----END PGP SIGNATURE----- diff --git a/net-print/hplip/hplip-3.11.10-r1.ebuild b/net-print/hplip/hplip-3.11.10-r1.ebuild index ca2edb3250de..99af6f7c5290 100644 --- a/net-print/hplip/hplip-3.11.10-r1.ebuild +++ b/net-print/hplip/hplip-3.11.10-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.11.10-r1.ebuild,v 1.1 2011/11/01 12:37:10 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.11.10-r1.ebuild,v 1.2 2011/11/01 15:13:51 billie Exp $ -EAPI=3 +EAPI=4 PYTHON_DEPEND="!minimal? 2" PYTHON_USE_WITH="threads xml" @@ -103,7 +103,7 @@ src_prepare() { # Fix for Gentoo bug #345725 sed -i -e "s|/etc/udev/rules.d|/$(get_libdir)/udev/rules.d|" \ $(find ./ -type f -exec grep -l '/etc/udev/rules.d' '{}' '+') \ - || die "sed udev rules" + || die # Do not install desktop files if there is no gui # Upstream bug: https://bugs.launchpad.net/hplip/+bug/452113 @@ -216,7 +216,6 @@ src_configure() { fi econf \ - --disable-dependency-tracking \ --disable-cups11-build \ --disable-lite-build \ --disable-foomatic-rip-hplip-install \ @@ -238,12 +237,15 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die + default # Installed by sane-backends # Gentoo Bug: #201023 rm -f "${D}"/etc/sane.d/dll.conf || die + rm -f "${D}"/usr/share/doc/hplip-3.11.10-r1/{copyright,README_LIBJPG,COPYING} || die + rmdir "${D}"/usr/share/doc/hplip-3.11.10-r1/ >/dev/null + find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die } |