EAPI=2; built_with_use -> has_version

Package-Manager: portage-2.1.7.17/cvs/Linux i686

diff --git a/games-fps/quake1-data/ChangeLog b/games-fps/quake1-data/ChangeLog
index d62172cb9ae9b96910e7f34434c2d7de045652a3..566f8ec03ed16e37451af36f7c50d1dbb15626e9 100644 (file)
--- a/games-fps/quake1-data/ChangeLog
+++ b/games-fps/quake1-data/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/quake1-data
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-data/ChangeLog,v 1.8 2008/09/26 18:33:10 zmedico Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-data/ChangeLog,v 1.9 2010/03/18 03:45:43 mr_bones_ Exp $
+
+  18 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  quake1-data-2.40.ebuild:
+  EAPI=2; built_with_use -> has_version
 
   26 Sep 2008; Zac Medico <zmedico@gentoo.org> quake1-data-2.40.ebuild:
   Set PROPERTIES=interactive since src_unpack() calls cdrom_get_cds().

diff --git a/games-fps/quake1-data/Manifest b/games-fps/quake1-data/Manifest
index 8b67d30f8c1adfa9284a380b0e9214dd6d264b8a..52e2d014266484856fa48e0f657e113a012a7a81 100644 (file)
--- a/games-fps/quake1-data/Manifest
+++ b/games-fps/quake1-data/Manifest
@@ -1,13 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-EBUILD quake1-data-2.40.ebuild 2117 RMD160 6cf5dd1b56bcc918bd3aa447505e37df8f05c1e4 SHA1 f6ded8111b921f1ea2fe5628f1bbdde926470ca6 SHA256 0c95859d6d1ba1ae68378fec37c14454c2277c35ff0112572a3392982a0bf1bb
-MISC ChangeLog 1491 RMD160 ca85f3b6302dbeb9df4d58bbacc113d67c8d5e8e SHA1 0acc9cbdd3559d1415519d25ea59158f639c1b58 SHA256 cabb09554482c0d63cbee5a0241ea25580439a717a6ed2347ae4878291e5446a
+EBUILD quake1-data-2.40.ebuild 2126 RMD160 77babf09e1019d092dd5c3363438425a325d4bb6 SHA1 5e92e2b427431fa37e92cdbb85d6cdbe69770622 SHA256 63a3361d6c063dcf640a4ffa4d025602c8d63440aded497eb50ff322bcfb44b7
+MISC ChangeLog 1616 RMD160 e501936d43c9f30ad41277d77ce5180f93b34935 SHA1 675360cc37482c28053503cefd58657786b70e84 SHA256 1c0fc6623aae143008fb15a2073d7aab2bb2fecb7bdf101ac398c97c61cf3324
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjdKuYACgkQ/ejvha5XGaMXsgCgx6sgMgccd5TqsGpUbelIKWjA
-b6QAnAvuYvboBlHcjExysvVUVkQ3nIED
-=TnNq
------END PGP SIGNATURE-----

diff --git a/games-fps/quake1-data/quake1-data-2.40.ebuild b/games-fps/quake1-data/quake1-data-2.40.ebuild
index dc4063a571c72214921d0b1aa40f325625d4ec4d..7ea844a8762287de8606aa501a4d3a519161f997 100644 (file)
--- a/games-fps/quake1-data/quake1-data-2.40.ebuild
+++ b/games-fps/quake1-data/quake1-data-2.40.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-data/quake1-data-2.40.ebuild,v 1.14 2008/09/26 18:33:10 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-data/quake1-data-2.40.ebuild,v 1.15 2010/03/18 03:45:43 mr_bones_ Exp $
 
 # TODO: if installing off of the 1.01 cd, need to fetch the
 #       quake shareware and use that pak0
 # http://linux.omnipotent.net/article.php?article_id=11287
 # ftp://ftp.cdrom.com/pub/idgames/idstuff/quake/quake106.zip
 
+EAPI=2
 inherit eutils games
 
 DESCRIPTION="iD Software's Quake 1 ... the data files"
@@ -28,7 +29,7 @@ pkg_setup() {
        games_pkg_setup
 
        if has_version games-fps/quake1-demodata && \
-          built_with_use "games-fps/quake1-demodata" symlink ; then
+          ! has_version "games-fps/quake1-demodata[symlink]" ; then
                eerror "The symlink for the demo data conflicts with the cdinstall data"
                die "Unmerge games-fps/quake1-demodata to remove the conflict"
        fi