diff options
| author |   Daniel Pielmeier <billie@gentoo.org> | 2011-11-01 15:13:51 +0000 |
|---|---|---|
| committer | Daniel Pielmeier <billie@gentoo.org> | 2011-11-01 15:13:51 +0000 |
| commit | 718472f22d213317e3f7c90a80f1d6e24e93af14 (patch) | |
| tree | f4fdf13714092cd1739a587e76058d5831c41eba /net-print | |
| parent | Update LICENSE #388865 by Hans. (diff) | |
| download | gentoo-2-718472f22d213317e3f7c90a80f1d6e24e93af14.tar.gz gentoo-2-718472f22d213317e3f7c90a80f1d6e24e93af14.tar.bz2 gentoo-2-718472f22d213317e3f7c90a80f1d6e24e93af14.zip | |
Switch to EAPI 4. Remove Copyright files.
(Portage version: 2.1.10.32/cvs/Linux i686)
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/hplip/ChangeLog | 5 | ||||
| -rw-r--r-- | net-print/hplip/hplip-3.11.10-r1.ebuild | 12 |
2 files changed, 11 insertions, 6 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/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 } |