| 1 |
commit: f8c3f9907a86a0fd3bdf7bbde82a54e80177733b |
| 2 |
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 4 20:13:09 2016 +0000 |
| 4 |
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 4 20:41:53 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8c3f990 |
| 7 |
|
| 8 |
games-fps/quake1-data: use blocker instead of pkg_setup code (bug #581536) |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
|
| 12 |
games-fps/quake1-data/quake1-data-2.40.ebuild | 14 ++------------ |
| 13 |
1 file changed, 2 insertions(+), 12 deletions(-) |
| 14 |
|
| 15 |
diff --git a/games-fps/quake1-data/quake1-data-2.40.ebuild b/games-fps/quake1-data/quake1-data-2.40.ebuild |
| 16 |
index 03074c5..602e5db 100644 |
| 17 |
--- a/games-fps/quake1-data/quake1-data-2.40.ebuild |
| 18 |
+++ b/games-fps/quake1-data/quake1-data-2.40.ebuild |
| 19 |
@@ -1,4 +1,4 @@ |
| 20 |
-# Copyright 1999-2014 Gentoo Foundation |
| 21 |
+# Copyright 1999-2016 Gentoo Foundation |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
# $Id$ |
| 24 |
|
| 25 |
@@ -20,20 +20,10 @@ KEYWORDS="amd64 ~ia64 ppc x86" |
| 26 |
IUSE="" |
| 27 |
|
| 28 |
DEPEND="app-arch/lha" |
| 29 |
-RDEPEND="" |
| 30 |
+RDEPEND="!games-fps/quake1-demodata[symlink]" |
| 31 |
|
| 32 |
S=${WORKDIR} |
| 33 |
|
| 34 |
-pkg_setup() { |
| 35 |
- games_pkg_setup |
| 36 |
- |
| 37 |
- if has_version games-fps/quake1-demodata && \ |
| 38 |
- ! has_version "games-fps/quake1-demodata[symlink]" ; then |
| 39 |
- eerror "The symlink for the demo data conflicts with the cdinstall data" |
| 40 |
- die "Unmerge games-fps/quake1-demodata to remove the conflict" |
| 41 |
- fi |
| 42 |
-} |
| 43 |
- |
| 44 |
src_unpack() { |
| 45 |
export CDROM_NAME_SET=("Existing Install" "Quake CD (1.01)" "Ultimate Quake Collection" "Quake CD (newer)") |
| 46 |
cdrom_get_cds id1:q101_int.1:Setup/ID1:resource.1 |
Archives