diff options
| author |   Richard Yao <ryao@gentoo.org> | 2012-05-27 17:50:27 +0000 |
|---|---|---|
| committer | Richard Yao <ryao@gentoo.org> | 2012-05-27 17:50:27 +0000 |
| commit | 605af6de9042e17a5641107d2d1d4796031412e5 (patch) | |
| tree | d928ded38fdbb6852384d8a0d8f644cfbdbac3a4 /virtual/pkgconfig | |
| parent | arm stable, bug #416105 (diff) | |
| download | historical-605af6de9042e17a5641107d2d1d4796031412e5.tar.gz historical-605af6de9042e17a5641107d2d1d4796031412e5.tar.bz2 historical-605af6de9042e17a5641107d2d1d4796031412e5.zip | |
Change order on Gentoo/*BSD, bug #417693
Package-Manager: portage-2.1.10.49/cvs/Linux x86_64
Diffstat (limited to 'virtual/pkgconfig')
| -rw-r--r-- | virtual/pkgconfig/ChangeLog | 5 | ||||
| -rw-r--r-- | virtual/pkgconfig/Manifest | 18 | ||||
| -rw-r--r-- | virtual/pkgconfig/pkgconfig-0.ebuild | 22 |
3 files changed, 22 insertions, 23 deletions
diff --git a/virtual/pkgconfig/ChangeLog b/virtual/pkgconfig/ChangeLog index 494da7170eda..85cd6b12b015 100644 --- a/virtual/pkgconfig/ChangeLog +++ b/virtual/pkgconfig/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for virtual/pkgconfig # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/pkgconfig/ChangeLog,v 1.6 2012/05/19 07:47:39 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/pkgconfig/ChangeLog,v 1.7 2012/05/27 17:50:27 ryao Exp $ + + 27 May 2012; Richard Yao <ryao@gentoo.org> pkgconfig-0.ebuild: + Change order on Gentoo/*BSD, bug #417693 19 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org> pkgconfig-0.ebuild: Do not allow ancient versions of dev-util/pkgconfig, they cause interesting diff --git a/virtual/pkgconfig/Manifest b/virtual/pkgconfig/Manifest index 4d78ed4d3a4a..1eb6567a4744 100644 --- a/virtual/pkgconfig/Manifest +++ b/virtual/pkgconfig/Manifest @@ -1,17 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -EBUILD pkgconfig-0.ebuild 804 RMD160 7c5efcc3db0fa1443051b0af3c7b980e82d69b90 SHA1 58f30ed323a5e5257da2abba9705c1e6f079abcc SHA256 7968ffac184cd182dc6f1ea3e7dae348b2bd856cb6e44f5579fffa1eb60cf716 -MISC ChangeLog 805 RMD160 687cd954c2bc35bf67f25240d73cee553322b4f8 SHA1 47991864a27712d5998fa8fdd4aeff224cfed724 SHA256 f23e1f495233396647225e27cc2c34fefa9ee753697f5f694f679358a0d7ed5b +EBUILD pkgconfig-0.ebuild 980 RMD160 1e96b4afcc7cbf001752d8f88842b7a46e22a0fa SHA1 bbaebd0bb4f10766f5123b370a9afe275e410b65 SHA256 f29ccba65827b04e38ef9e3eb4eb7b47981d7f3236778e96b270d48259b0ce47 +MISC ChangeLog 909 RMD160 ace4b280fec63d72465a72117a217357dc9834e0 SHA1 ddd2ceac1549b9eee1315091c0bae24dd0407468 SHA256 159eee90daa47f1513d43bd09e18c894c226bbf0471add273bb52ad48d489d6b MISC metadata.xml 186 RMD160 fb86db7f25b5c8f7bfc7a21dc0073386e0d1f750 SHA1 0d699e324d6660f78c77a780b9f9d9fc23ca10ab SHA256 c90e43cb0c7e54a082db47d3f0df110024139f524c5a1fd5c180b9b66a34d84e ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iQEcBAEBAgAGBQJPt1ArAAoJEJ0WA1zPCt1hQ9gIAJmappOKRlrS5zyj6SO4Htu2 -P03l2O1ksObMV3vTqrZOVJBBhvFFozH2dt4V+pcx8U6mcEQBKR0AdwvuAkJlpiJN -AOfLGtazOivXqy/Rwr0vPCGogTmfsRRTD8O9PqP9fYqXGvenfZMmnkISu13xpgPs -IGDaTpthpL7YpF7Ca1TnIXWh3eHaHYsOOWwpHAoBqTF8tyB5qzgg7uRWuqirqmIX -R8qxAucJRbKgqZtPbRFNIFaIr1TsEvULPIaM43QPY82eJZy4g++rKBCn/VRF539N -Tkk6jM6Pzcy0TApT9LI5EhOKnDffvtLEvefCU7s2w5vFnbAN6qM9h4D42CC0iZg= -=4UjE ------END PGP SIGNATURE----- diff --git a/virtual/pkgconfig/pkgconfig-0.ebuild b/virtual/pkgconfig/pkgconfig-0.ebuild index 0fca40222f04..c4e28bd3df7c 100644 --- a/virtual/pkgconfig/pkgconfig-0.ebuild +++ b/virtual/pkgconfig/pkgconfig-0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/pkgconfig/pkgconfig-0.ebuild,v 1.4 2012/05/19 07:45:01 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/pkgconfig/pkgconfig-0.ebuild,v 1.5 2012/05/27 17:50:27 ryao Exp $ EAPI="2" @@ -13,10 +13,20 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" -DEPEND="|| ( - >=dev-util/pkgconfig-0.26 - dev-util/pkg-config-lite - dev-util/pkgconf[pkg-config] - dev-util/pkgconfig-openbsd[pkg-config] +DEPEND="userland_BSD? ( + || ( + dev-util/pkgconf[pkg-config] + dev-util/pkgconfig-openbsd[pkg-config] + dev-util/pkgconfig + dev-util/pkg-config-lite + ) + ) + !userland_BSD? ( + || ( + >=dev-util/pkgconfig-0.26 + dev-util/pkg-config-lite + dev-util/pkgconf[pkg-config] + dev-util/pkgconfig-openbsd[pkg-config] + ) )" RDEPEND="${DEPEND}" |