Modular X dependency fix; version bump, bug #52796: thanks to Matija Suklje.

(Portage version: 2.1_pre5-r2)

7 files changed, 248 insertions, 22 deletions

diff --git a/games-puzzle/gemhun/ChangeLog b/games-puzzle/gemhun/ChangeLog
index 25aecb9bde49..b0737e7de055 100644
--- a/games-puzzle/gemhun/ChangeLog
+++ b/games-puzzle/gemhun/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-puzzle/gemhun
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gemhun/ChangeLog,v 1.3 2004/06/24 23:04:42 agriffis Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gemhun/ChangeLog,v 1.4 2006/03/06 20:22:27 tupone Exp $
+
+*gemhun-20040529 (06 Mar 2006)
+
+  06 Mar 2006; <Tupone@gentoo.org> +files/20040529-gentoo.patch,
+  gemhun-20031016.ebuild, +gemhun-20040529.ebuild:
+  Modular X dependency fix
+  version bump (Bug #52796) Thanks to Matija Suklje
 
   31 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> gemhun-20031016.ebuild:
   flag-o-matic; error check sed; tidy
diff --git a/games-puzzle/gemhun/Manifest b/games-puzzle/gemhun/Manifest
index ccddd320f993..94ad2c878e57 100644
--- a/games-puzzle/gemhun/Manifest
+++ b/games-puzzle/gemhun/Manifest
@@ -1,15 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 bbc9f77a9e1bb8997a9c1ec51ecdf533 gemhun-20031016.ebuild 1240
-MD5 786b2fa358fde54e0a6de87145e72509 ChangeLog 535
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 2ec1584532f1d3495fcac9cc354b2463 ChangeLog 763
+RMD160 0b52516a99925458ec77b19e2cb5ed9819b14665 ChangeLog 763
+SHA256 63f2c8f372ae124aee246315422320290ed50683f97a2e8a5f7db8bb07c6c222 ChangeLog 763
 MD5 393571e3c21b30fd4e04becaeefb7abb files/20031016-gentoo-paths.patch 456
-MD5 d9b9075f724cf1ab7eaad477421cd853 files/digest-gemhun-20031016 76
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBpP5+I1lqEGTUzyQRAmE7AKCRnvb9gx/0bH5Iby+9KITQrG76ywCgyjco
-VmYM0Ui2HCBwdcM0qWHHgco=
-=9DkH
------END PGP SIGNATURE-----
+RMD160 6b529dbfbd902f21518fc0359c6f4219f46a2bf6 files/20031016-gentoo-paths.patch 456
+SHA256 c668a1a978dad4afc4624f54bbae32efb8da68bfde63ac2fe719f1a0bbc7f3bd files/20031016-gentoo-paths.patch 456
+MD5 fe18cbfed2ea4061cb8c1c71c7acbfed files/20040529-gentoo.patch 4541
+RMD160 9bb80209cecbb37ec4495b35ae75eed8704c9c97 files/20040529-gentoo.patch 4541
+SHA256 0a2a5b79b9e2f9cc1e1189087fcdfb3189736edba2456671449b9456e124c23d files/20040529-gentoo.patch 4541
+MD5 545a10ee3fb3fce9589db37ed100cc17 files/digest-gemhun-20031016 274
+RMD160 c93d0a7259d6f97d9ea6fbe4da46b9d6145654c4 files/digest-gemhun-20031016 274
+SHA256 60c334a1d47a001ccf8feed3f4368c9146f1f91ccb2284075489c50cf783b77b files/digest-gemhun-20031016 274
+MD5 6bec1584cad08f234c4b5882ce6537e9 files/digest-gemhun-20040529 846
+RMD160 e60b5bc14f0f1b6d672469f686d2b19f23de6656 files/digest-gemhun-20040529 846
+SHA256 a8934b1f425c1c8f2f7e523f149083b8e9eaf9285cfc4c8e34c0d232177c20f6 files/digest-gemhun-20040529 846
+MD5 50fc98ea7062dca62c223ce1a89876e5 gemhun-20031016.ebuild 1204
+RMD160 fa8523c585955eab07986973617c8e17ae2742ef gemhun-20031016.ebuild 1204
+SHA256 db657474647cbfb21b2f60c3d8f21ef705efbc299ef89f4b4e18e8aef6148009 gemhun-20031016.ebuild 1204
+MD5 f6ac9559d2957e9b3c883e9e49136fa9 gemhun-20040529.ebuild 1374
+RMD160 8ef9805dd30405fc920dba0160b0a0cb2e6e0e6f gemhun-20040529.ebuild 1374
+SHA256 ab4c2fd2b904ef4489d9bfaac37ecf56eabe09dabad45e5f95ea213ce2ff3794 gemhun-20040529.ebuild 1374
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
diff --git a/games-puzzle/gemhun/files/20040529-gentoo.patch b/games-puzzle/gemhun/files/20040529-gentoo.patch
new file mode 100644
index 000000000000..9beb15ebef91
--- /dev/null
+++ b/games-puzzle/gemhun/files/20040529-gentoo.patch
@@ -0,0 +1,156 @@
+--- configure.in.old	2006-03-05 05:35:28.000000000 +0100
++++ configure.in	2006-03-05 05:35:40.000000000 +0100
+@@ -72,11 +72,11 @@
+ if test "x${prefix}" = "xNONE"; then
+   packageprefix=${ac_default_prefix}
+ else
+-  packageprefix=${prefix}
++  packageprefix=${datadir}
+ fi
+ 
+ dnl Set PACKAGE DATA & DOC DIR
+-packagedatadir=share/${PACKAGE}
++packagedatadir=${PACKAGE}
+ packagedocdir=doc/${PACKAGE}
+ 
+ dnl Set PACKAGE DIRS in config.h.
+--- data/gfx/Makefile.am.old	2006-03-05 05:37:14.000000000 +0100
++++ data/gfx/Makefile.am	2006-03-05 05:38:28.000000000 +0100
+@@ -3,7 +3,7 @@
+ #  makefile for generating our gfx resource files
+ #
+ 
+-gemhun_datadir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/gfx
++gemhun_datadir = $(pkgdatadir)/gfx
+ 
+ gemhun_data_DATA = \
+ 	default_gems.pax\
+--- data/sfx/Makefile.am.old	2006-03-05 05:37:19.000000000 +0100
++++ data/sfx/Makefile.am	2006-03-05 05:38:28.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-gemhun_datadir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/sfx
++gemhun_datadir = $(pkgdatadir)/sfx
+ 
+ gemhun_data_DATA = \
+ 	bang.wav\
+--- data/music/Makefile.am.old	2006-03-05 05:37:23.000000000 +0100
++++ data/music/Makefile.am	2006-03-05 05:38:28.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-gemhun_datadir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/music
++gemhun_datadir = $(pkgdatadir)/music
+ 
+ gemhun_data_DATA = \
+ 	pink.ogg
+--- data/pax/networkscreen/Makefile.am.old	2006-03-05 05:37:36.000000000 +0100
++++ data/pax/networkscreen/Makefile.am	2006-03-05 05:38:28.000000000 +0100
+@@ -3,7 +3,7 @@
+ #  makefile for generating our gfx resource file
+ #
+ 
+-gemhun_datadir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/pax/networkscreen
++gemhun_datadir = $(pkgdatadir)/pax/networkscreen
+ 
+ gemhun_data_DATA = \
+ 	Sonnenseite.xm\
+--- data/pax/title/Makefile.am.old	2006-03-05 05:37:43.000000000 +0100
++++ data/pax/title/Makefile.am	2006-03-05 05:38:28.000000000 +0100
+@@ -3,7 +3,7 @@
+ #  makefile for generating our gfx resource file
+ #
+ 
+-gemhun_datadir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/pax/title
++gemhun_datadir = $(pkgdatadir)/pax/title
+ 
+ gemhun_data_DATA = \
+ 	fdream.xm\
+--- data/levels/Makefile.am.old	2006-03-05 05:37:50.000000000 +0100
++++ data/levels/Makefile.am	2006-03-05 05:38:28.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-gemhun_datadir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/pax/levels
++gemhun_datadir = $(pkgdatadir)/pax/levels
+ 
+ gemhun_data_DATA = \
+ 	level0.dat\
+--- pixmaps/Makefile.am.old	2006-03-05 05:43:12.000000000 +0100
++++ pixmaps/Makefile.am	2006-03-05 05:43:30.000000000 +0100
+@@ -4,7 +4,7 @@
+ ## If you don't want it to overwrite it,
+ ## 	Please disable it in the Anjuta project configuration
+ 
+-gemhun_pixmapsdir = $(prefix)/@NO_PREFIX_PACKAGE_PIXMAPS_DIR@
++gemhun_pixmapsdir = $(pkgdatadir)/pixmaps
+ 
+ gemhun_pixmaps_DATA = \
+ 	gemhun.png
+--- include/Makefile.am.old	2006-03-05 05:44:50.000000000 +0100
++++ include/Makefile.am	2006-03-05 05:45:04.000000000 +0100
+@@ -4,9 +4,8 @@
+ ## If you don't want it to overwrite it,
+ ## 	Please disable it in the Anjuta project configuration
+ 
+-gemhun_includedir = $(pkgincludedir)
+ 
+-gemhun_include_DATA = \
++noinst_HEADERS = \
+ 	SDL_rotozoom.h\
+ 	ai.h\
+ 	audio.h\
+@@ -39,4 +38,3 @@
+ 	video_overlay.h\
+ 	nconsole.h
+ 
+-EXTRA_DIST = $(gemhun_include_DATA)
+--- Makefile.am.old	2006-03-05 05:45:40.000000000 +0100
++++ Makefile.am	2006-03-05 05:45:59.000000000 +0100
+@@ -5,18 +5,10 @@
+ 
+ SUBDIRS = intl po data include src pixmaps
+ 
+-gemhundocdir = ${prefix}/doc/GemHunters
+-gemhundoc_DATA = \
+-	README\
+-	COPYING\
+-	AUTHORS\
+-	ChangeLog\
+-	INSTALL\
+-	NEWS\
++EXTRA_DIST = \
+ 	TODO\
+ 	ABOUT-NLS
+ 
+-EXTRA_DIST = $(gemhundoc_DATA)
+ 
+ 
+ 
+--- src/Makefile.am.old	2006-03-05 05:46:53.000000000 +0100
++++ src/Makefile.am	2006-03-05 05:46:57.000000000 +0100
+@@ -16,11 +16,11 @@
+ INCLUDES =\
+ 	 -I../include
+ 
+-CFLAGS =\
++AM_CFLAGS =\
+ 	$(SDL_CFLAGS) $(KYRA_CFLAGS) $(NCURSES_CFLAGS)\
+ 	 -Wall -g
+ 
+-CXXFLAGS =\
++AM_CXXFLAGS =\
+ 	$(SDL_CFLAGS) $(KYRA_CFLAGS) $(NCURSES_CFLAGS)\
+ 	 -Wall -g
+ 
+--- src/main.cpp.old	2006-03-05 05:47:47.000000000 +0100
++++ src/main.cpp	2006-03-05 05:47:52.000000000 +0100
+@@ -459,7 +459,6 @@
+ #ifdef __NETWORK_SUPPORT__
+ 	if ( dedicated_server && ! no_curs_gui )
+ 		network . EnableConsolePrinting ( NULL, NULL ) ;
+-	network . ListenOnPort ( server_port ) ;
+ 	network . UpdateNConsole () ;
+ 	if ( strcmp ( pkg_filename, "network" ) != 0 ||
+ 		( dedicated_server && no_curs_gui ) )
diff --git a/games-puzzle/gemhun/files/digest-gemhun-20031016 b/games-puzzle/gemhun/files/digest-gemhun-20031016
index e5d27dd6d735..fe485be2b01c 100644
--- a/games-puzzle/gemhun/files/digest-gemhun-20031016
+++ b/games-puzzle/gemhun/files/digest-gemhun-20031016
@@ -1 +1,3 @@
 MD5 6513e95c2f89669a29c0bdfd0fd6fede GemHunters-src-20031016.tar.gz 4393549
+RMD160 e658f711230722f002ce2e09e29525683b1e3abf GemHunters-src-20031016.tar.gz 4393549
+SHA256 f37df174e71b4f8c1bbc7b3eff4fa0ac51b46a7c89b6328255fe2b340d41d56f GemHunters-src-20031016.tar.gz 4393549
diff --git a/games-puzzle/gemhun/files/digest-gemhun-20040529 b/games-puzzle/gemhun/files/digest-gemhun-20040529
new file mode 100644
index 000000000000..d2bb59010cfb
--- /dev/null
+++ b/games-puzzle/gemhun/files/digest-gemhun-20040529
@@ -0,0 +1,9 @@
+MD5 a1c8abe95c62f4f4de5fb55cbd9da7e6 GemHunters-src-20040529.tar.gz 3888860
+RMD160 2cb87f5d20116a287137bc809ed480f160056de0 GemHunters-src-20040529.tar.gz 3888860
+SHA256 829cb1b44933211b5487c056e9521c9232cea5f2f1abc0a74ae10d2aae9143a5 GemHunters-src-20040529.tar.gz 3888860
+MD5 8faa4c99a831ae7fbaa3d3768e4920e0 fairylands-bin-20040529.tar.gz 1237487
+RMD160 75d83d816ea351479c25c114332cf6a5e112c66c fairylands-bin-20040529.tar.gz 1237487
+SHA256 9b5abccdff7c5df8532f09548b9a925d98463a23da15619a830c25dfd27c0c22 fairylands-bin-20040529.tar.gz 1237487
+MD5 0d0b7707ff7662320fa129867f638cd0 stars_in_the_night-bin-20040529.tar.gz 1539453
+RMD160 b84e07cb08fe0102335edb0e05ef40dfb000bf47 stars_in_the_night-bin-20040529.tar.gz 1539453
+SHA256 1c8637aa6ac013517128ae7b202da245e68d36c7bb28e90409adc8f586092a4b stars_in_the_night-bin-20040529.tar.gz 1539453
diff --git a/games-puzzle/gemhun/gemhun-20031016.ebuild b/games-puzzle/gemhun/gemhun-20031016.ebuild
index ecba2f6aa8c1..e92e1c6afe5a 100644
--- a/games-puzzle/gemhun/gemhun-20031016.ebuild
+++ b/games-puzzle/gemhun/gemhun-20031016.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gemhun/gemhun-20031016.ebuild,v 1.5 2004/06/24 23:04:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gemhun/gemhun-20031016.ebuild,v 1.6 2006/03/06 20:22:27 tupone Exp $
 
 inherit eutils flag-o-matic games
 
@@ -14,11 +14,9 @@ SLOT="0"
 KEYWORDS="x86 ppc"
 IUSE=""
 
-RDEPEND="dev-games/kyra
+DEPEND="dev-games/kyra
 	>=media-libs/sdl-mixer-1.2.1
-	virtual/x11"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
+	virtual/opengl"
 
 src_unpack() {
 	unpack ${A}
diff --git a/games-puzzle/gemhun/gemhun-20040529.ebuild b/games-puzzle/gemhun/gemhun-20040529.ebuild
new file mode 100644
index 000000000000..6096317e4745
--- /dev/null
+++ b/games-puzzle/gemhun/gemhun-20040529.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gemhun/gemhun-20040529.ebuild,v 1.1 2006/03/06 20:22:27 tupone Exp $
+
+inherit eutils autotools games
+
+DESCRIPTION="A puzzle game about grouping gems of a chosen amount together"
+HOMEPAGE="http://gemhun.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gemhun/GemHunters-src-${PV}.tar.gz
+	mirror://sourceforge/gemhun/fairylands-bin-${PV}.tar.gz
+	mirror://sourceforge/gemhun/stars_in_the_night-bin-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+DEPEND="dev-games/kyra
+	>=media-libs/sdl-mixer-1.2.1
+	virtual/opengl
+	sys-libs/ncurses
+	media-libs/sdl-net
+	media-libs/libpng"
+
+S="${WORKDIR}/GemHunters-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# Fix to comply with gentoo-path
+	# and to remove a nasty violation by commenting a network calls
+	# Until upstream fix, that is
+	epatch "${FILESDIR}/${PV}-gentoo.patch"
+	eautoreconf || die "eautoreconf failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "Install failed"
+	dodoc AUTHORS ChangeLog README README.Install TODO
+	cp -r ../fairylands "${D}${GAMES_DATADIR}/GemHunters/pax/"
+	cp -r ../stars_in_the_night "${D}${GAMES_DATADIR}/GemHunters/pax/"
+	doicon pixmaps/${PN}.png
+	make_desktop_entry ${PN} "GemHunter" ${PN}.xpm
+	prepgamesdirs
+}