diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-04-07 22:26:22 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-04-07 22:26:22 +0000 |
| commit | a2c342d06f9530376aca81c0202ead3323f8527a (patch) | |
| tree | fb0d15fda43425a7394ab1ce7483616985091827 /net-print | |
| parent | Disable automagic linking to x11-libs/libXxf86misc on request from scarabeus (diff) | |
| download | historical-a2c342d06f9530376aca81c0202ead3323f8527a.tar.gz historical-a2c342d06f9530376aca81c0202ead3323f8527a.tar.bz2 historical-a2c342d06f9530376aca81c0202ead3323f8527a.zip | |
QA: only try to set up active python version when python USE flag is enabled.
Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/cups/ChangeLog | 5 | ||||
| -rw-r--r-- | net-print/cups/Manifest | 14 | ||||
| -rw-r--r-- | net-print/cups/cups-1.4.6.ebuild | 8 |
3 files changed, 21 insertions, 6 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index 45a55f463f3c..02d7465eff28 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-print/cups # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.405 2011/03/19 17:54:11 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.406 2011/04/07 22:26:22 flameeyes Exp $ + + 07 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> cups-1.4.6.ebuild: + QA: only try to set up active python version when python USE flag is enabled. 19 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> cups-1.3.11-r4.ebuild, cups-1.4.6.ebuild: diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index 017bc397b1e0..b10cd3408c5e 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX cups-1.3.0-configure.patch 651 RMD160 e4c7f45d7ddc28157433bf025c7f946c7e3b6d6a SHA1 101bf1893b56640d9fa82078e29319fbbd1449c7 SHA256 d6e5e60a982a3c093c0d0f89cf865e2b4c36290f5b1e188b7bf305d210070736 AUX cups-1.3.10-str3178.patch 888 RMD160 ff061fc3500960f441c59896cdfe421d5f47f386 SHA1 fac5361b1172aba167d48988f874faa6faf1554a SHA256 e6550fad17017ac6897e6e9c70a4aafaaec5473c05a19e9e50277293cdc6aac6 AUX cups-1.3.11-pdf-m4.patch 1476 RMD160 be4d4ed2b699625282c9725faee08e01edca9b7a SHA1 a8b092b9c155c161c781319a94cb1bb7de734c3f SHA256 191b0c41c142ed31718fc01f55fcefc6c26735fa56165c23450fd7a454818b01 @@ -19,6 +22,13 @@ AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SH DIST cups-1.3.11-source.tar.bz2 3799393 RMD160 a0646f2ba29fbd39d211ea5c3fdbd24a00f66a78 SHA1 df5cfb64fb608fc128acadde670dc30af49bdb18 SHA256 5e310fd324a15fae1e1c9721879f5c948d788e04735a5263a40c6146fff607b8 DIST cups-1.4.6-source.tar.bz2 4517061 RMD160 94c9921e03f5ec52d9c16947435622365f53aef6 SHA1 42fb1ca00ee7291561564d3072716eb2045f05d1 SHA256 f08711702a77b52c7150f96fe1f45482f6151cb95ef601268c528607fe6ad514 EBUILD cups-1.3.11-r4.ebuild 8452 RMD160 49759a7347bec3c3f05b17fc04f338bfd5ca36c4 SHA1 08fc7999a8a214432563eaad22dd81f737f8da56 SHA256 8feef05c1dbf1e4b5c8aaab4adc1e9223e3d28e6892339422eb26bcbf0b0b895 -EBUILD cups-1.4.6.ebuild 6211 RMD160 4a6752eace71b4346a0abee6d839b1905ce950ce SHA1 79fa281d87901acf39dedc021a57520c6fb4c77f SHA256 251047b5ce4caf219a2a78e01856a2f2a401143d75e375b17df6c9c7dbb5178c -MISC ChangeLog 60606 RMD160 76d655d61ad3d8afe39a163a9d50e1a9137c8f91 SHA1 2c8a737bdcbfaf79c91affd085bbb02a9464bd02 SHA256 a747b0accafa1c8de0fb61142a0ec80dd91e56376e3a301bd0fcb792629c52cb +EBUILD cups-1.4.6.ebuild 6238 RMD160 2f1102bcc99574bd5588fb97b842345c451df7cb SHA1 501d98c577bbdc5d876b0463d00a14711d0af6db SHA256 ce10e5f1586ec0b50623e9e9c364c5f18d46e03e3a9974f4cde34910e669495e +MISC ChangeLog 60762 RMD160 e4914d830cfd87ab8fd1acb9422fe8aae4b345fe SHA1 1f13be47f4f3099079b07576b91c89a27527724c SHA256 cb41da47999c8088753fbcf0fa99d912c994603cce847a5431a60854272c93ec MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk2eOhMACgkQAiZjviIA2XhHagCg0BCUhjBTwoCh3iSJSGpUerI5 +cJUAoK/+pvMuXxJ/MLUPzQYQtbPiKOyl +=DHzQ +-----END PGP SIGNATURE----- diff --git a/net-print/cups/cups-1.4.6.ebuild b/net-print/cups/cups-1.4.6.ebuild index 8ba6d5195ecc..09331c95436d 100644 --- a/net-print/cups/cups-1.4.6.ebuild +++ b/net-print/cups/cups-1.4.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.6.ebuild,v 1.2 2011/03/19 17:54:11 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.6.ebuild,v 1.3 2011/04/07 22:26:22 flameeyes Exp $ EAPI=3 @@ -74,8 +74,10 @@ pkg_setup() { enewgroup lpadmin 106 # python 3 is no-go - python_set_active_version 2 - python_pkg_setup + if use python; then + python_set_active_version 2 + python_pkg_setup + fi } src_prepare() { |