diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2006-08-18 19:53:34 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2006-08-18 19:53:34 +0000 |
| commit | e52b8e63054f3423ceb92285c155d0b26c21b5c6 (patch) | |
| tree | fd5d3822861f48b9b67a9bcd477d3918251f7e76 /net-print | |
| parent | minor fixups as suggested by ferdy (bug #144336) (diff) | |
| download | historical-e52b8e63054f3423ceb92285c155d0b26c21b5c6.tar.gz historical-e52b8e63054f3423ceb92285c155d0b26c21b5c6.tar.bz2 historical-e52b8e63054f3423ceb92285c155d0b26c21b5c6.zip | |
Depend with X useflag on xdg-utils to select the browser thanks to Wiktor Wandachowicz <siryes@gmail.com> in bug 137934
Package-Manager: portage-2.1.1_pre5-r2
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/cups/ChangeLog | 6 | ||||
| -rw-r--r-- | net-print/cups/Manifest | 16 | ||||
| -rw-r--r-- | net-print/cups/cups-1.2.2.ebuild | 16 |
3 files changed, 26 insertions, 12 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index bb01e5a1d33c..7e2e4168c3a6 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-print/cups # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.193 2006/08/17 23:59:44 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.194 2006/08/18 19:53:34 genstef Exp $ + + 18 Aug 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.2.2.ebuild: + Depend with X useflag on xdg-utils to select the browser thanks to Wiktor + Wandachowicz <siryes@gmail.com> in bug 137934 17 Aug 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.1.23-r8.ebuild, cups-1.2.2.ebuild: diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index 9164b66c0012..1dcaf10fb37a 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -76,14 +76,14 @@ EBUILD cups-1.1.23-r8.ebuild 4963 RMD160 3e19f1c744dd482ce3a277288fe749fbbe5eec8 MD5 1a6910f3b2a5b3f6900ac380e513f84a cups-1.1.23-r8.ebuild 4963 RMD160 3e19f1c744dd482ce3a277288fe749fbbe5eec84 cups-1.1.23-r8.ebuild 4963 SHA256 d314487c71ab2dfb919fee6f2be86cfd1908fbc4959d2ddc57b2edd232059b69 cups-1.1.23-r8.ebuild 4963 -EBUILD cups-1.2.2.ebuild 5657 RMD160 3a681d88358466df6a8d10b940de5225821bd586 SHA1 07ef72b313a5f740f8e24e0a19b1751fc93038d7 SHA256 57a9c1d9cd8da5f202d028537b4f221511f2721d20c0ed0fd1600ede7199f6aa -MD5 50027b84d222c0e583cce15209bd7b4b cups-1.2.2.ebuild 5657 -RMD160 3a681d88358466df6a8d10b940de5225821bd586 cups-1.2.2.ebuild 5657 -SHA256 57a9c1d9cd8da5f202d028537b4f221511f2721d20c0ed0fd1600ede7199f6aa cups-1.2.2.ebuild 5657 -MISC ChangeLog 26931 RMD160 29e35664fc6266968acb9231879e9b6c30098677 SHA1 5e8b2147eed7e75bf2cdfd7c952e9ec0ce7ebd5e SHA256 d8e8eecc3de538b6d40d49c4350e2d609afd47df69b3d07ed728ade5e91f5467 -MD5 caeee0d92fd368f2e4aa46f3c142aa16 ChangeLog 26931 -RMD160 29e35664fc6266968acb9231879e9b6c30098677 ChangeLog 26931 -SHA256 d8e8eecc3de538b6d40d49c4350e2d609afd47df69b3d07ed728ade5e91f5467 ChangeLog 26931 +EBUILD cups-1.2.2.ebuild 5946 RMD160 ba658095d56455d3732d9452a6bf677190f29895 SHA1 e23d720bb2536e36f5d7ddf56c0044d719aa8a97 SHA256 a921e343f092e5b18433ea48311ad48ea6738bae88f6672664a24881e7682ee4 +MD5 747303706378d79ac6e11fe240c60b96 cups-1.2.2.ebuild 5946 +RMD160 ba658095d56455d3732d9452a6bf677190f29895 cups-1.2.2.ebuild 5946 +SHA256 a921e343f092e5b18433ea48311ad48ea6738bae88f6672664a24881e7682ee4 cups-1.2.2.ebuild 5946 +MISC ChangeLog 27128 RMD160 86c2ad62e0d12031f577263d9756d7a796141ed3 SHA1 5548d2568e49a77d8eb4302e600ac56fdca64ccb SHA256 a807f50afff8a56fb5630b8415f48af3b85b4579e589dbb2c99d467f6c5c2623 +MD5 3f6f4a22b6ae05f03bc088ac8b3a638e ChangeLog 27128 +RMD160 86c2ad62e0d12031f577263d9756d7a796141ed3 ChangeLog 27128 +SHA256 a807f50afff8a56fb5630b8415f48af3b85b4579e589dbb2c99d467f6c5c2623 ChangeLog 27128 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161 diff --git a/net-print/cups/cups-1.2.2.ebuild b/net-print/cups/cups-1.2.2.ebuild index db7ff1eb6559..a676800125b4 100644 --- a/net-print/cups/cups-1.2.2.ebuild +++ b/net-print/cups/cups-1.2.2.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/cups/cups-1.2.2.ebuild,v 1.2 2006/08/17 23:59:44 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.2.ebuild,v 1.3 2006/08/18 19:53:34 genstef Exp $ inherit autotools eutils flag-o-matic multilib pam @@ -14,7 +14,7 @@ SRC_URI="http://ftp.easysw.com/pub/cups/${PV}/${MY_P}-source.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="ssl slp pam samba nls gnutls dbus tiff png ppds jpeg" +IUSE="ssl slp pam samba nls gnutls dbus tiff png ppds jpeg X" DEP="pam? ( virtual/pam ) ssl? ( @@ -44,7 +44,10 @@ RDEPEND="${DEP} media-gfx/gimp-print net-print/foo2zjs net-print/cups-pdf - ) )" + ) ) + X? ( x86? ( x11-misc/xdg-utils ) ) + " + # keywording xdg-utils in bug 144345 PDEPEND="samba? ( >=net-fs/samba-3.0.8 ) virtual/ghostscript" PROVIDE="virtual/lpr" @@ -137,6 +140,13 @@ src_install() { keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \ /var/run/cups/certs /var/cache/cups /var/spool/cups/tmp + + # .desktop handling. X useflag. xdg-open from freedesktop is preferred + if use X; then + sed -i -e "s:htmlview:xdg-open:" ${D}/usr/share/applications/cups.desktop + else + rm -r ${D}/usr/share/applications + fi } pkg_preinst() { |