diff options
| author |   Steven J Newbury <steve@snewbury.org.uk> | 2009-04-07 01:37:08 +0100 |
|---|---|---|
| committer | Steven J Newbury <steve@snewbury.org.uk> | 2009-04-07 01:37:08 +0100 |
| commit | bea034d1e9492614c279fb8d362fdb51c316c006 (patch) | |
| tree | 8dcbf7b375d149c9cf6fcd3709afd229482d8d07 /net-print | |
| parent | Update Manifest (diff) | |
| download | multilib-portage-bea034d1e9492614c279fb8d362fdb51c316c006.tar.gz multilib-portage-bea034d1e9492614c279fb8d362fdb51c316c006.tar.bz2 multilib-portage-bea034d1e9492614c279fb8d362fdb51c316c006.zip | |
Make net-print/cups EAPI=2 compliant and use
MULTILIB_IN_SOURCE_BUILD=yes
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/cups/Manifest | 4 | ||||
| -rw-r--r-- | net-print/cups/cups-1.3.8-r2.ebuild | 13 | ||||
| -rw-r--r-- | net-print/cups/cups-1.3.9-r1.ebuild | 13 |
3 files changed, 10 insertions, 20 deletions
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index 189f15f78..7e3c11955 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -10,7 +10,7 @@ AUX cupsd.init.d 293 RMD160 19fbef21cee7e472e7028f3101b680baa0089c54 SHA1 e6b27b AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1 DIST cups-1.3.8-source.tar.bz2 3978390 RMD160 dc077c748ea7c8df7333260a96c7527a9b8d7c9e SHA1 3943608111426722ea6a2e0db588636b013acc1a SHA256 d488980f84ad0e6044a67859144306980624cafb654eb0cab071b3e46fee6e1d DIST cups-1.3.9-source.tar.bz2 3993875 RMD160 ec8bd9fc6ee45648b6eb22949f44fc4cf2defd4e SHA1 c1a596b355201320456b393446286fe3947bce16 SHA256 38856ab4b8bcf51be2bed1f554cd8089c1f2448a6979c055762b49eda82a6b6b -EBUILD cups-1.3.8-r2.ebuild 9155 RMD160 8540bc018294dad33ac6d44c1922f4ddc89e0f16 SHA1 12f774bbb8743e2f0386ff39882518d0d6112b76 SHA256 44b04ce6bc75d1ea5bfb803aabc5a7c7e6abd8e45581032e96814a25ca164eed -EBUILD cups-1.3.9-r1.ebuild 8851 RMD160 67498a023294c4d4262cd541ddbd046a7fe03dcc SHA1 d33ea3cd93dab043d4aa1cdf6c0e46f178d37305 SHA256 98e3b0bbea3438a29e0beae1793f60317d6fe19e1d57cd993235f2c54190c8cc +EBUILD cups-1.3.8-r2.ebuild 9136 RMD160 be789f8386c4fea1d75c2bb8d1be4b90c2b5a0df SHA1 f2529dea9b93b62cee8093c53fb09af7adaee173 SHA256 78f7fbed90e8e3ff9d4714da749f7c7e07d745d2bc7b87bb98f8514d15250205 +EBUILD cups-1.3.9-r1.ebuild 8832 RMD160 04e9608d155f4da6617206af9f00813b1264aee5 SHA1 3fb55cbfe974f87c88597b7d81059c800c0e15a1 SHA256 2ca6745130f3f545543eb3085428460d01ad4a87ba154cf9cc63168607f0f46b MISC ChangeLog 50821 RMD160 40b896dd3fe2e308420adf8dedad90a47f7a066c SHA1 6928b3b72f18deda401537d2563aee8943769add SHA256 b825113915ff055c699aa09561538d9e21b8de21d770c06db46f5953b71bf6b3 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 diff --git a/net-print/cups/cups-1.3.8-r2.ebuild b/net-print/cups/cups-1.3.8-r2.ebuild index 379f8e908..302d68edc 100644 --- a/net-print/cups/cups-1.3.8-r2.ebuild +++ b/net-print/cups/cups-1.3.8-r2.ebuild @@ -4,6 +4,8 @@ EAPI="2" +MULTILIB_IN_SOURCE_BUILD="yes" + inherit autotools eutils flag-o-matic multilib pam multilib-native MY_P=${P/_} @@ -92,10 +94,7 @@ pkg_setup() { enewgroup lpadmin 106 } -src_unpack() { - unpack ${A} - cd "${S}" - +multilib-native_src_prepare_internal() { # disable configure automagic for acl/attr, upstream bug STR #2723 epatch "${FILESDIR}/${PN}-1.3.0-configure.patch" @@ -118,9 +117,7 @@ src_unpack() { eautoconf } -src_configure() { :; } - -multilib-native_src_compile_internal() { +multilib-native_src_configure_internal() { # needed to prevent ghostscript compile failures use kerberos && strip-flags @@ -188,8 +185,6 @@ multilib-native_src_compile_internal() { 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" } multilib-native_src_install_internal() { diff --git a/net-print/cups/cups-1.3.9-r1.ebuild b/net-print/cups/cups-1.3.9-r1.ebuild index f3ad960df..614e98024 100644 --- a/net-print/cups/cups-1.3.9-r1.ebuild +++ b/net-print/cups/cups-1.3.9-r1.ebuild @@ -4,6 +4,8 @@ EAPI="2" +MULTILIB_IN_SOURCE_BUILD="yes" + inherit autotools eutils flag-o-matic multilib pam multilib-native MY_P=${P/_} @@ -92,10 +94,7 @@ pkg_setup() { enewgroup lpadmin 106 } -src_unpack() { - unpack ${A} - cd "${S}" - +multilib-native_src_prepare_internal() { # disable configure automagic for acl/attr, upstream bug STR #2723 epatch "${FILESDIR}/${PN}-1.3.0-configure.patch" @@ -110,9 +109,7 @@ src_unpack() { eautoconf } -src_configure() { :; } - -multilib-native_src_compile_internal() { +multilib-native_src_configure_internal() { # Fails to compile on SH use sh && replace-flags -O? -O0 @@ -183,8 +180,6 @@ multilib-native_src_compile_internal() { 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" } multilib-native_src_install_internal() { |