diff options
| author |   Daniel Solano Gómez <daniel@solanogomez.org> | 2010-02-19 19:35:08 -0600 |
|---|---|---|
| committer | Daniel Solano Gómez <daniel@solanogomez.org> | 2010-02-19 19:35:08 -0600 |
| commit | d63d3e67cb7e0f499d1f9cedc374f7e45552843d (patch) | |
| tree | 40ee8d216727401800d5feeaf0e7c11c592a50b0 /net-print | |
| parent | Add dzen live ebuild (diff) | |
| download | sattvik-d63d3e67cb7e0f499d1f9cedc374f7e45552843d.tar.gz sattvik-d63d3e67cb7e0f499d1f9cedc374f7e45552843d.tar.bz2 sattvik-d63d3e67cb7e0f499d1f9cedc374f7e45552843d.zip | |
Updated ebuild to fix broken dependencies.
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/cups/Manifest | 2 | ||||
| -rw-r--r-- | net-print/cups/cups-1.3.11-r1.ebuild | 18 |
2 files changed, 8 insertions, 12 deletions
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index fe7c6fe..61f5b81 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -12,7 +12,7 @@ DIST cups-1.3.10-source.tar.bz2 3778970 RMD160 9c8f5366f84b5f9087f7a29bace677db3 DIST cups-1.3.11-source.tar.bz2 3799393 RMD160 a0646f2ba29fbd39d211ea5c3fdbd24a00f66a78 SHA1 df5cfb64fb608fc128acadde670dc30af49bdb18 SHA256 5e310fd324a15fae1e1c9721879f5c948d788e04735a5263a40c6146fff607b8 DIST cups-1.4.1-source.tar.bz2 4449577 RMD160 d6db8ff3c7b0e56e147d227dcac0c8ca92f190cf SHA1 e53cadf8d9fa5b52b224fc29364a879feb0f3508 SHA256 cff66f14ca2099c977d693136b8f1b4c5d2d66e4471d67fa4114653852c2d3ba EBUILD cups-1.3.10-r2.ebuild 8377 RMD160 f8fc53e54687346ff6d199945297e13e47c34a4a SHA1 921b568a256079876fd5d0f10b9f1a2185cb8cf0 SHA256 1fdbd5e6130d71cdad5c33b5ce21a363882503a95295d04a19778a70e167df71 -EBUILD cups-1.3.11-r1.ebuild 8626 RMD160 11a4375aff93b4fa99012f8f91d1be3753614d61 SHA1 65071b4ef05cc34846b55b1bd1d5c340382d4a6f SHA256 e88565d40cb38f4d002db0e0f8058ca84dc5f4b99f763245e8f3ab448bdad4cc +EBUILD cups-1.3.11-r1.ebuild 8596 RMD160 b0d66238eb7208a6a7e6a90d2840579efaeb8ef5 SHA1 6cd1234623797c01391176cb8947dbeb4873a579 SHA256 06473c41740c28f1dd655faa4e781519cc6b7888fbbb8c9812ddde3db74d71a3 EBUILD cups-1.4.1.ebuild 5125 RMD160 ab6a6ec500853bcee204f353e8d279f5594247a4 SHA1 5b42e16e212adddfcfdc2e1be93bd3bb9a9dbf9b SHA256 31aa6db1061e1425f0ba1c8a8a8265c09b4da5f6746b85571169547490c77ecd MISC ChangeLog 538 RMD160 fc6d2d9fc1846a808b9254e93911d2fbcd0ef59c SHA1 2760de7d36e707d2279282974e9ab62834f3c3e8 SHA256 03d6e9317627275b207e6a1ff5083d43293e1ca8b5562fd2db7b3f415b006e15 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 diff --git a/net-print/cups/cups-1.3.11-r1.ebuild b/net-print/cups/cups-1.3.11-r1.ebuild index 6f94e0c..00a265e 100644 --- a/net-print/cups/cups-1.3.11-r1.ebuild +++ b/net-print/cups/cups-1.3.11-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r1.ebuild,v 1.8 2009/11/24 04:02:42 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r1.ebuild,v 1.10 2010/02/10 19:46:08 ssuominen Exp $ +EAPI=2 inherit autotools eutils flag-o-matic multilib pam MY_P=${P/_} @@ -43,7 +44,7 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} !virtual/lpr X? ( x11-misc/xdg-utils ) - >=virtual/poppler-utils-0.4.3-r1 + >=app-text/poppler-0.12.3-r3[utils] " PDEPEND=" @@ -60,7 +61,7 @@ PDEPEND=" net-print/cups-pdf ) ) samba? ( >=net-fs/samba-3.0.8 ) - virtual/ghostscript" + app-text/ghostscript-gpl" PROVIDE="virtual/lpr" @@ -91,10 +92,7 @@ pkg_setup() { enewgroup lpadmin 106 } -src_unpack() { - unpack ${A} - cd "${S}" - +src_prepare() { # disable configure automagic for acl/attr, upstream bug STR #2723 epatch "${FILESDIR}/${PN}-1.3.0-configure.patch" @@ -115,7 +113,7 @@ src_unpack() { eautoconf } -src_compile() { +src_configure() { # Fails to compile on SH use sh && replace-flags -O? -O0 @@ -187,8 +185,6 @@ src_compile() { sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config - - emake || die "emake failed" } src_install() { |