summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-11-13 10:14:43 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-11-13 10:14:43 +0000
commit09546ae45f282d95771b35047344cc5564e05d93 (patch)
treefc3e7533da0d3d5fb0b0f461e4d5e9372c39392b /media-libs
parentKeyworded for Prefix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86... (diff)
downloadhistorical-09546ae45f282d95771b35047344cc5564e05d93.tar.gz
historical-09546ae45f282d95771b35047344cc5564e05d93.tar.bz2
historical-09546ae45f282d95771b35047344cc5564e05d93.zip
Fix python.eclass depend usage
Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/vigra/ChangeLog5
-rw-r--r--media-libs/vigra/Manifest16
-rw-r--r--media-libs/vigra/vigra-1.7.1-r1.ebuild14
3 files changed, 20 insertions, 15 deletions
diff --git a/media-libs/vigra/ChangeLog b/media-libs/vigra/ChangeLog
index 7511e1fb0c89..8aeb63bdbe7a 100644
--- a/media-libs/vigra/ChangeLog
+++ b/media-libs/vigra/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/vigra
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.45 2011/11/13 10:12:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.46 2011/11/13 10:14:43 ssuominen Exp $
+
+ 13 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> vigra-1.7.1-r1.ebuild:
+ Fix python.eclass depend usage
13 Nov 2011; Justin Lecher <jlec@gentoo.org> vigra-1.7.1-r1.ebuild:
Keyworded for Prefix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index c07c6ef9f40c..4320f591cfdf 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
AUX 1.7.1-automagicness.patch 1608 RMD160 caa7ccad70104818b326b40c02e3f35797de4b10 SHA1 fbb5b7843c17a8a5f55db13d458eef444cc5adbe SHA256 8d6d73ff40155cd34eff25ff8f32c8bd25f32d63264548b3262fb8b788526957
AUX 1.7.1-fix-nosetest.patch 1506 RMD160 24134d08a00bccb3ed3194e18e2eeb73991985f9 SHA1 d5794217519442cf1d10cae997956ade3fd8f26e SHA256 21ad06a9cf2c0f0c48531be7209e1879dc57e6204717df20e4dcb3c1e8053a8c
@@ -9,14 +9,18 @@ AUX 1.7.1-hdf5.patch 1290 RMD160 c9dd4347ce5f289fe0389a0ab1b8f55f102b3d87 SHA1 1
AUX 1.7.1-numpy_doc.patch 996 RMD160 a92dadb31c3410bcf5ec29b5edcdfa537e53b98d SHA1 927e95a99f1d156209916b55f049f1c9961af8c8 SHA256 bb764e22b8af92d107e87a36e40e7c287189397adbc8e5de76c69ba3d8aeb555
AUX 1.7.1-png-1.5.patch 1259 RMD160 782a8a41a8a6bc5433c98ef39a190bfe1eb7d57a SHA1 15370e3151eb84281b35d2bac97054662dc2bab9 SHA256 28e1fa88143bdda03dadde5dfa43e1c86e38e338907e12d0e7cb23d5c6b85c68
DIST vigra-1.7.1-src.tar.gz 28481160 RMD160 67a27b11f3d844b01fd8f2b0d2fe761099f8170b SHA1 f90f54da31a6544057c25df7dbcc6954604de079 SHA256 4fe9052085330300f8c8564021b67fc2c5d534132ef29e781d839feb5d5c0ec2
-EBUILD vigra-1.7.1-r1.ebuild 2823 RMD160 c252e684f4b4c3703a92f41c714a5e8fe8b9e4ff SHA1 8c5d9f088c19133eef980dea6a9364df19c238ab SHA256 d2e7844480b5050a3e35e142096bcaa2024cd12be69910f7aad0939b67a6f8e1
+EBUILD vigra-1.7.1-r1.ebuild 2810 RMD160 53fb1f8748e6b2db522cc462d5f170ff8ecfd55e SHA1 a85d770f82ce3d5e98895be7193cd720f38fb3b1 SHA256 7334f1410c97b5c4825a9f6869ab84823e9297733ccbb4dbc3ac390ea73cd5ba
EBUILD vigra-1.7.1.ebuild 2369 RMD160 9e15643e3edec5ea2bdbea0b2c895eeda6673ed3 SHA1 06aba76dd56790502dfe650dba4eebfec9fc30e7 SHA256 1d1b7c569c3de2768c128102ea45d478f6d179065aaf04f5dfe1ebeaff75b80f
-MISC ChangeLog 6365 RMD160 161a30867cac1eec076b63054c9e414452896983 SHA1 515c809ba603c0b5878b4214c3086d8bb3d836f8 SHA256 3f46fe90850ad25b113ccfb632b8ec1947ef960e968f84c53c58b89089e52c13
+MISC ChangeLog 6481 RMD160 57bc3336efe0a3353df781fb8394eb2f018234d7 SHA1 0229da7f4997da028d1d4de06661048b6a9cd3f0 SHA256 efd11ecbabafa6929d0e2b819d8aee97f98c8752e81b63438915cc3095eb1550
MISC metadata.xml 187 RMD160 9c8b8edd91cb93979173540d1df3d264539f1f94 SHA1 c1f16177a9daf628b0fe0dcc6f8e694111d2a578 SHA256 6f9a63412850ecb6e6c0d6989f6ebe6dffe84bbb1bf3038cf8a0491b7c819161
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEAREKAAYFAk6/mCMACgkQgAnW8HDreRYrgwCcCA6z66OxyDAcK9WQ+KSt6ZQV
-NBMAoKUFA5NkXlsjWhnIyonZebxsSn9k
-=nBzh
+iQEcBAEBAgAGBQJOv5hQAAoJEEdUh39IaPFNzRAH/16AdyLTPSomCZCQO0o0iuxN
+P1NJhRliKfdWkBmmlQznTCsvEzflc/H0May0z2zrvhaigWseFBvQvVpqN/RWVm6J
+9GI6K0G8/94z51CeHUWHsevD4vfPociRvaHMKEqm2hFjcPBIGzVNm4hYI7z1rD0p
+HfPiJ5GPsVLPFZ7KAjKlTH5qlVTmRJaSQ/AZg/zumWGCnycA8JiZiIDjetZazgSE
+uf3nTK3D0QZ9GtPHoLh1x06lr9FYtvwVtEcMXCzINfhbnPHlTarEvMLNkXSxJ+Ar
+dOPb7bW0luxgxYHBQWk/Rf0aVUIOhsanspr3EmhL5ScfrEXKlAZZ2bjCuadLgTc=
+=tRrf
-----END PGP SIGNATURE-----
diff --git a/media-libs/vigra/vigra-1.7.1-r1.ebuild b/media-libs/vigra/vigra-1.7.1-r1.ebuild
index 70d08786685f..0206e2a60c77 100644
--- a/media-libs/vigra/vigra-1.7.1-r1.ebuild
+++ b/media-libs/vigra/vigra-1.7.1-r1.ebuild
@@ -1,11 +1,12 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.7.1-r1.ebuild,v 1.6 2011/11/13 10:12:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.7.1-r1.ebuild,v 1.7 2011/11/13 10:14:43 ssuominen Exp $
EAPI=4
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="threads,xml"
+PYTHON_DEPEND="python? 2:2.6"
+PYTHON_USE_WITH_OPT="python"
+PYTHON_USE_WITH="threads xml"
MY_P=${P}-src
@@ -25,11 +26,8 @@ RDEPEND="
fftw? ( >=sci-libs/fftw-3 )
hdf5? ( sci-libs/hdf5 )
jpeg? ( virtual/jpeg )
- png? ( media-libs/libpng )
- python? (
- || ( dev-lang/python:2.6 dev-lang/python:2.7 )
- )
- tiff? ( media-libs/tiff )
+ png? ( media-libs/libpng:0 )
+ tiff? ( media-libs/tiff:0 )
"
DEPEND="${RDEPEND}
doc? (