Add gaim use flag and fix install paths

Package-Manager: portage-2.1.2_pre2-r8

4 files changed, 113 insertions, 22 deletions

diff --git a/games-board/ggz-gtk-client/ChangeLog b/games-board/ggz-gtk-client/ChangeLog
index 4234e572ec94..322fac9d14ef 100644
--- a/games-board/ggz-gtk-client/ChangeLog
+++ b/games-board/ggz-gtk-client/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/ggz-gtk-client
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-gtk-client/ChangeLog,v 1.14 2006/07/18 21:48:42 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-gtk-client/ChangeLog,v 1.15 2006/10/11 15:35:26 nyhm Exp $
+
+  11 Oct 2006; Tristan Heaven <nyhm@gentoo.org>
+  +files/ggz-gtk-client-0.0.13-gaim.patch, ggz-gtk-client-0.0.13.ebuild:
+  Add gaim use flag and fix install paths
 
   18 Jul 2006; Michael Hanselmann <hansmi@gentoo.org>
   ggz-gtk-client-0.0.13.ebuild:
diff --git a/games-board/ggz-gtk-client/Manifest b/games-board/ggz-gtk-client/Manifest
index 104cff6bb6da..69492324939f 100644
--- a/games-board/ggz-gtk-client/Manifest
+++ b/games-board/ggz-gtk-client/Manifest
@@ -2,13 +2,17 @@ AUX 0.0.9-duplicate-prototypes.patch 697 RMD160 e4c025d7ea24ae825e53d03ee997270a
 MD5 23cbf7e56fed5e7283f6b88bf62050e4 files/0.0.9-duplicate-prototypes.patch 697
 RMD160 e4c025d7ea24ae825e53d03ee997270aea0cfd70 files/0.0.9-duplicate-prototypes.patch 697
 SHA256 161429f802897343ba2dfa8f28b826c3afcb912233ca32b821c050a3445cbdad files/0.0.9-duplicate-prototypes.patch 697
+AUX ggz-gtk-client-0.0.13-gaim.patch 1546 RMD160 f56a9fc9c5b8b1b267b1d383e215ef4e4c4afe39 SHA1 b7ba6173343e37712935dfedcc4c7027751ac824 SHA256 06b2462f6c4c34807ab5580682cbe365ba86413a04d8bd86c7437e4072e9ddd0
+MD5 45f983fbd8b8616c91f88f39b9c67dab files/ggz-gtk-client-0.0.13-gaim.patch 1546
+RMD160 f56a9fc9c5b8b1b267b1d383e215ef4e4c4afe39 files/ggz-gtk-client-0.0.13-gaim.patch 1546
+SHA256 06b2462f6c4c34807ab5580682cbe365ba86413a04d8bd86c7437e4072e9ddd0 files/ggz-gtk-client-0.0.13-gaim.patch 1546
 DIST ggz-gtk-client-0.0.13.tar.gz 724743 RMD160 23b3be9b6d274e58dc45ff19a849fe4f5948e3bc SHA1 402ffe6f313e8bb04c32553557505f544453df28 SHA256 c947392a28ce3011c7b9e3de883ee7c4fdfbfb42569c141a04246275a05c9413
 DIST ggz-gtk-client-0.0.5.tar.gz 245923
 DIST ggz-gtk-client-0.0.9.tar.gz 383193 RMD160 b15dcfe8b4b1284b29eb6fc5dc7035abc3590ec8 SHA1 6b4f66d73a318ed3fc79c85058b9f222dc890333 SHA256 3def0ba123483c842205ce4b16129e2aa814adfb0a6f6b39c5475b973533e875
-EBUILD ggz-gtk-client-0.0.13.ebuild 974 RMD160 bb87f9ef44ec7ddc4c542297597bbebe7e1b6c59 SHA1 40569d8f5a7c03d0e10c3a79265337a9996d2ac5 SHA256 724c4d467747e16820c452cff844714beb353df0c64f371d429d4d76b96b0385
-MD5 c6f7322328635d96ef276118351512da ggz-gtk-client-0.0.13.ebuild 974
-RMD160 bb87f9ef44ec7ddc4c542297597bbebe7e1b6c59 ggz-gtk-client-0.0.13.ebuild 974
-SHA256 724c4d467747e16820c452cff844714beb353df0c64f371d429d4d76b96b0385 ggz-gtk-client-0.0.13.ebuild 974
+EBUILD ggz-gtk-client-0.0.13.ebuild 1514 RMD160 0b9df89db87f69e717c5fdd2da16c6e27b920526 SHA1 b6f43a5219f77df49af7bc64cf18576591fb69c3 SHA256 fee970bdbd07519bee6f8f37ed1ff9ef688e1144ced8ee988f4e894327cefcb0
+MD5 07aa48db5c932c060ad68abc052bb73a ggz-gtk-client-0.0.13.ebuild 1514
+RMD160 0b9df89db87f69e717c5fdd2da16c6e27b920526 ggz-gtk-client-0.0.13.ebuild 1514
+SHA256 fee970bdbd07519bee6f8f37ed1ff9ef688e1144ced8ee988f4e894327cefcb0 ggz-gtk-client-0.0.13.ebuild 1514
 EBUILD ggz-gtk-client-0.0.5.ebuild 565 RMD160 1a49bd7bafdcc24da7401a06d2db4113d59ba807 SHA1 1ec4f5d2266af37ec7270f92b42b6e656ea304aa SHA256 794cf2b20a9f2077000707d0d3a119684ce5db2d001a297cbbe162b7426f2c3f
 MD5 60c53f233d2b0d790c7093fefee8872f ggz-gtk-client-0.0.5.ebuild 565
 RMD160 1a49bd7bafdcc24da7401a06d2db4113d59ba807 ggz-gtk-client-0.0.5.ebuild 565
@@ -17,10 +21,10 @@ EBUILD ggz-gtk-client-0.0.9.ebuild 1014 RMD160 283754126d2dbd1893382b04adbd8ff4c
 MD5 71e6f4fdad360bce92f53f8fbdc88c77 ggz-gtk-client-0.0.9.ebuild 1014
 RMD160 283754126d2dbd1893382b04adbd8ff4c1aba65b ggz-gtk-client-0.0.9.ebuild 1014
 SHA256 5473a22ce14017bcfb821a1f9e3948495453139aba2d55ea4e447e4521b31f3e ggz-gtk-client-0.0.9.ebuild 1014
-MISC ChangeLog 2356 RMD160 736bbb8a74e2ebcfba727f093698fd7e68103965 SHA1 c3a59cb63c05dfe79ade02ace65a4879d4aaeafb SHA256 77dd9c072080bfefecfbccb3faa9f8fe6e7aa2630075e06cc1096cf6a573221e
-MD5 9625e7d42d16ae4c50a9d09776d4f585 ChangeLog 2356
-RMD160 736bbb8a74e2ebcfba727f093698fd7e68103965 ChangeLog 2356
-SHA256 77dd9c072080bfefecfbccb3faa9f8fe6e7aa2630075e06cc1096cf6a573221e ChangeLog 2356
+MISC ChangeLog 2518 RMD160 591c59e039dd8d76a2c76bbf07e5a37474b13830 SHA1 945f37bcd615b91a86275f5cdd3b311ab1ef48ce SHA256 c010db39347d199ba857bc7c8c347afd05fef844ba8dc6cfd3d1fc1471544cca
+MD5 09a5d5656bbc9c9f61307d3aa794310d ChangeLog 2518
+RMD160 591c59e039dd8d76a2c76bbf07e5a37474b13830 ChangeLog 2518
+SHA256 c010db39347d199ba857bc7c8c347afd05fef844ba8dc6cfd3d1fc1471544cca ChangeLog 2518
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
diff --git a/games-board/ggz-gtk-client/files/ggz-gtk-client-0.0.13-gaim.patch b/games-board/ggz-gtk-client/files/ggz-gtk-client-0.0.13-gaim.patch
new file mode 100644
index 000000000000..3f7e0045fb44
--- /dev/null
+++ b/games-board/ggz-gtk-client/files/ggz-gtk-client-0.0.13-gaim.patch
@@ -0,0 +1,59 @@
+--- configure.ac
++++ configure.ac
+@@ -28,8 +28,23 @@
+ 
+ dnl Gaim plugin check
+ dnl =================
+-AC_GAIM
+-
++AC_ARG_ENABLE([gaim],
++	AC_HELP_STRING([--enable-gaim], [build gaim plugin]),,
++	[enable_gaim=no])
++
++if test x$enable_gaim = xyes ; then
++	PKG_CHECK_MODULES(GAIM, [gaim])
++
++	GAIM_LIBDIR=`pkg-config --variable=libdir gaim`
++	GAIM_DATADIR=`pkg-config --variable=datadir gaim`
++	GAIMPLUGIN=gaim-plugin
++
++	AC_SUBST(GAIM_CFLAGS)
++	AC_SUBST(GAIM_LIBS)
++	AC_SUBST(GAIM_LIBDIR)
++	AC_SUBST(GAIM_DATADIR)
++	AC_SUBST(GAIMPLUGIN)
++fi
+ 
+ dnl Check for header files
+ dnl ======================
+@@ -118,7 +133,7 @@
+ echo "    GDB Debugging......$enable_debug_gdb"
+ echo "    Dmalloc Debugging..$enable_debug_mem"
+ echo ""
+-echo "    Gaim plugin........$have_gaim"
++echo "    Gaim plugin........$enable_gaim"
+ echo ""
+ echo "At the prompt type \"make\" to compile the GGZ gtk client"
+ echo ""
+
+--- gaim-plugin/Makefile.am
++++ gaim-plugin/Makefile.am
+@@ -1,15 +1,15 @@
+ ## Process this file with automake to produce Makefile.in
+ #  $Id: ggz-gtk-client-0.0.13-gaim.patch,v 1.1 2006/10/11 15:35:26 nyhm Exp $
+ 
+-plugindir = $(libdir)/gaim
++plugindir = @GAIM_LIBDIR@/gaim
+ 
+ plugin_LTLIBRARIES = ggzgaim.la
+ 
+ ggzgaim_la_SOURCES = simple.c
+ ggzgaim_la_LDFLAGS = -module -avoid-version @GTK_CFLAGS@ $(LIBGGZ_LDFLAGS)
+-ggzgaim_la_LIBADD = @GTK_LIBS@ $(LIB_GGZ)
++ggzgaim_la_LIBADD = @GTK_LIBS@ @GAIM_LIBS@ $(LIB_GGZ)
+ 
+-AM_CPPFLAGS = @GTK_CFLAGS@ $(LIBGGZ_INCLUDES)
++AM_CPPFLAGS = @GTK_CFLAGS@ @GAIM_CFLAGS@ $(LIBGGZ_INCLUDES)
+ 
+ EXTRA_DIST = ggz.xpm
+ 
diff --git a/games-board/ggz-gtk-client/ggz-gtk-client-0.0.13.ebuild b/games-board/ggz-gtk-client/ggz-gtk-client-0.0.13.ebuild
index cfd235410b44..1c69eb7a4cba 100644
--- a/games-board/ggz-gtk-client/ggz-gtk-client-0.0.13.ebuild
+++ b/games-board/ggz-gtk-client/ggz-gtk-client-0.0.13.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-gtk-client/ggz-gtk-client-0.0.13.ebuild,v 1.5 2006/09/28 20:57:25 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-gtk-client/ggz-gtk-client-0.0.13.ebuild,v 1.6 2006/10/11 15:35:26 nyhm Exp $
 
-inherit eutils games
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+inherit autotools eutils games
 
 DESCRIPTION="The gtk client for the GGZ Gaming Zone"
 HOMEPAGE="http://www.ggzgamingzone.org/"
@@ -12,26 +14,48 @@ SRC_URI="http://ftp.belnet.be/packages/ggzgamingzone/ggz/${PV}/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-amd64 ppc x86"
-IUSE=""
+IUSE="gaim"
+RESTRICT="userpriv"
 
-DEPEND="~dev-games/ggz-client-libs-0.0.13
-	=x11-libs/gtk+-2*"
+RDEPEND="~dev-games/ggz-client-libs-${PV}
+	=x11-libs/gtk+-2*
+	virtual/libintl
+	gaim? ( =net-im/gaim-1.5* )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/pkgconfig"
 
-src_compile() {
-	local myconf="--enable-gtk=gtk2"
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-gaim.patch
+
+	sed -i '/desktopdir/s:$(datadir):/usr/share:' \
+		Makefile.am || die "sed Makefile.am failed"
+
+	eautoreconf
+
+	sed -i 's:$(includedir):/usr/include:' \
+		ggz-gtk/Makefile.in || die "sed Makefile.in failed"
 
+	sed -i '/locale/s:$(prefix):/usr:' \
+		po/Makefile.in || die "sed configure.ac failed"
+}
+
+src_compile() {
 	egamesconf \
-		--enable-gtk=gtk2 \
 		--disable-debug \
+		$(use_enable gaim) \
 		|| die
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	dodir /usr/include
+	emake DESTDIR="${D}" install || die "emake install failed"
+	rmdir "${D}/${GAMES_PREFIX}"/include
+
 	dodoc AUTHORS ChangeLog NEWS QuickStart.GGZ README* TODO
-	domenu ${D}/usr/share/games/applications/ggz-gtk.desktop
-	rm -rf ${D}/usr/share/games
 	prepgamesdirs
 }
-