diff options
| author |   Marcelo Góes <vanquirius@gentoo.org> | 2006-02-14 16:40:06 +0000 |
|---|---|---|
| committer | Marcelo Góes <vanquirius@gentoo.org> | 2006-02-14 16:40:06 +0000 |
| commit | 016e4d06a1e082ce032579c231cc38e3417c9e49 (patch) | |
| tree | 3f1b6878e185670a7c27aea9da864335dada7dec /net-print | |
| parent | Bumping spca5xx and keywording ~ppc (diff) | |
| download | historical-016e4d06a1e082ce032579c231cc38e3417c9e49.tar.gz historical-016e4d06a1e082ce032579c231cc38e3417c9e49.tar.bz2 historical-016e4d06a1e082ce032579c231cc38e3417c9e49.zip | |
Do not install desktop entry if qt USE flag is not set for bug 122758. Thanks to Darcy <darcydot parks at gmail dot com>.
Package-Manager: portage-2.0.54
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/hplip/ChangeLog | 7 | ||||
| -rw-r--r-- | net-print/hplip/Manifest | 6 | ||||
| -rw-r--r-- | net-print/hplip/hplip-0.9.7-r3.ebuild | 12 | ||||
| -rw-r--r-- | net-print/hplip/hplip-0.9.8-r1.ebuild | 12 |
4 files changed, 27 insertions, 10 deletions
diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog index fa67841ed0b0..3563cb224053 100644 --- a/net-print/hplip/ChangeLog +++ b/net-print/hplip/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-print/hplip # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.21 2006/02/11 19:03:17 vanquirius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.22 2006/02/14 16:40:06 vanquirius Exp $ + + 14 Feb 2006; Marcelo Goes <vanquirius@gentoo.org> hplip-0.9.7-r3.ebuild, + hplip-0.9.8-r1.ebuild: + Do not install desktop entry if qt USE flag is not set for bug 122758. + Thanks to Darcy <darcydot parks at gmail dot com>. *hplip-0.9.8-r1 (11 Feb 2006) diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest index 6907d1f559c5..5aed0cc436d3 100644 --- a/net-print/hplip/Manifest +++ b/net-print/hplip/Manifest @@ -1,7 +1,7 @@ -MD5 6305562adad8c56ec7b82bcd74387aeb ChangeLog 3537 +MD5 1ccb5a176c82bcf5103518e9ff67d2ce ChangeLog 3764 MD5 68a5b9bc1ecb54c47e0aec2ea66b457a files/digest-hplip-0.9.7-r3 208 MD5 3268e75b85067eb8c5dc3d0e35a830c2 files/digest-hplip-0.9.8-r1 208 MD5 dcda3bf144b5f2cd4bebd1719383dd31 files/hplip.init.d 948 -MD5 60c7db1370063ff3ea1af7a85f2bbb9b hplip-0.9.7-r3.ebuild 3182 -MD5 683bf4c4ea7e60f7ddca10e5ea1cb249 hplip-0.9.8-r1.ebuild 3170 +MD5 001298dad68767f14f0b44c1fe30dd7a hplip-0.9.7-r3.ebuild 3340 +MD5 65e0d8eecc4a4e55ee29226dbe73639c hplip-0.9.8-r1.ebuild 3328 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 diff --git a/net-print/hplip/hplip-0.9.7-r3.ebuild b/net-print/hplip/hplip-0.9.7-r3.ebuild index 3fc19657ae19..ef34c0e963de 100644 --- a/net-print/hplip/hplip-0.9.7-r3.ebuild +++ b/net-print/hplip/hplip-0.9.7-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-0.9.7-r3.ebuild,v 1.4 2006/01/25 23:12:45 vanquirius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-0.9.7-r3.ebuild,v 1.5 2006/02/14 16:40:06 vanquirius Exp $ inherit eutils @@ -90,6 +90,8 @@ src_install() { rm -f "${D}"/usr/bin/hp-toolbox rm -f "${D}"/usr/share/hplip/print rm -f "${D}"/usr/share/hplip/toolbox + rm -f "${D}"/usr/share/hplip/data/hplip.desktop + rm -f "${D}"/usr/share/applications/hplip.desktop fi if use ppds; then @@ -112,6 +114,10 @@ src_install() { make DESTDIR="${D}" install || die fi - dodir /usr/share/applications - mv "${D}"/usr/share/hplip/data/hplip.desktop "${D}"/usr/share/applications + # desktop entry, bug 122758 + if use qt; then + dodir /usr/share/applications + mv "${D}"/usr/share/hplip/data/hplip.desktop \ + "${D}"/usr/share/applications + fi } diff --git a/net-print/hplip/hplip-0.9.8-r1.ebuild b/net-print/hplip/hplip-0.9.8-r1.ebuild index 3c30fbc72010..1f606246c61c 100644 --- a/net-print/hplip/hplip-0.9.8-r1.ebuild +++ b/net-print/hplip/hplip-0.9.8-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-0.9.8-r1.ebuild,v 1.1 2006/02/11 19:03:17 vanquirius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-0.9.8-r1.ebuild,v 1.2 2006/02/14 16:40:06 vanquirius Exp $ inherit eutils @@ -89,6 +89,8 @@ src_install() { rm -f "${D}"/usr/bin/hp-toolbox rm -f "${D}"/usr/share/hplip/print rm -f "${D}"/usr/share/hplip/toolbox + rm -f "${D}"/usr/share/hplip/data/hplip.desktop + rm -f "${D}"/usr/share/applications/hplip.desktop fi if use ppds; then @@ -111,6 +113,10 @@ src_install() { make DESTDIR="${D}" install || die fi - dodir /usr/share/applications - mv "${D}"/usr/share/hplip/data/hplip.desktop "${D}"/usr/share/applications + # desktop entry, bug 122758 + if use qt; then + dodir /usr/share/applications + mv "${D}"/usr/share/hplip/data/hplip.desktop \ + "${D}"/usr/share/applications + fi } |