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

(Portage version: 2.1_pre5-r2)

3 files changed, 167 insertions, 0 deletions

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