new version, move G2CONF into pkg_setup, filed bug for howl patch upstream(gnome) #314108

Package-Manager: portage-2.0.51.22-r2

5 files changed, 123 insertions, 3 deletions

diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog
index 05c35c471778..e3ffd09d50ae 100644
--- a/gnome-extra/gnome-games/ChangeLog
+++ b/gnome-extra/gnome-games/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-games
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.119 2005/08/08 14:51:59 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.120 2005/08/21 17:57:58 allanonjl Exp $
+
+*gnome-games-2.11.4 (21 Aug 2005)
+
+  21 Aug 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +files/gnome-games-2.11.4-nohowl.patch, +gnome-games-2.11.4.ebuild:
+  new version, move G2CONF into pkg_setup, filed bug for howl patch
+  upstream(gnome) #314108
 
   08 Aug 2005; Markus Rothe <corsair@gentoo.org> gnome-games-2.10.1.ebuild:
   Stable on ppc64
diff --git a/gnome-extra/gnome-games/Manifest b/gnome-extra/gnome-games/Manifest
index 4f9c2bf122d3..c81763108377 100644
--- a/gnome-extra/gnome-games/Manifest
+++ b/gnome-extra/gnome-games/Manifest
@@ -1,9 +1,12 @@
-MD5 b87e38782d283cfad86939fb5041dc67 ChangeLog 13814
 MD5 f02a05514168bad80a360c1c3211900f gnome-games-1.4.0.3-r3.ebuild 1272
 MD5 eb63eab37adca3710bf147a7c501b319 gnome-games-2.10.0.ebuild 2055
 MD5 5c70e1374d666ad858880f959355e330 gnome-games-2.10.1.ebuild 2059
+MD5 ec9d867dfbdea01ff8abd01fff0a84f7 gnome-games-2.11.4.ebuild 2086
+MD5 d2af9d9a6a09464ba2e68135f61e636f ChangeLog 14072
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 2301a09a3e02fd7e40f6ee5a7e79e95c files/digest-gnome-games-1.4.0.3-r3 72
+MD5 05ba368f9e9d4b208ecf3e839ffba4a0 files/gnome-games-2.9.6-nohowl.patch 953
+MD5 a6d5477575722e3b5bec6c15356eb4a1 files/gnome-games-2.11.4-nohowl.patch 922
 MD5 d12063544c92d2ed0dff801d3d593707 files/digest-gnome-games-2.10.0 72
 MD5 c33cfe151eccd5d14201388ceb3f4adc files/digest-gnome-games-2.10.1 72
-MD5 05ba368f9e9d4b208ecf3e839ffba4a0 files/gnome-games-2.9.6-nohowl.patch 953
+MD5 9138c39a85f16e12120e85b7c38e5b42 files/digest-gnome-games-2.11.4 72
diff --git a/gnome-extra/gnome-games/files/digest-gnome-games-2.11.4 b/gnome-extra/gnome-games/files/digest-gnome-games-2.11.4
new file mode 100644
index 000000000000..f3ed357bd798
--- /dev/null
+++ b/gnome-extra/gnome-games/files/digest-gnome-games-2.11.4
@@ -0,0 +1 @@
+MD5 a1918551b282a04d74d4950955a433f0 gnome-games-2.11.4.tar.bz2 4934384
diff --git a/gnome-extra/gnome-games/files/gnome-games-2.11.4-nohowl.patch b/gnome-extra/gnome-games/files/gnome-games-2.11.4-nohowl.patch
new file mode 100644
index 000000000000..88709500dd32
--- /dev/null
+++ b/gnome-extra/gnome-games/files/gnome-games-2.11.4-nohowl.patch
@@ -0,0 +1,24 @@
+--- gnome-games-2.11.4/configure.in	2005-08-08 03:42:16.000000000 -0400
++++ gnome-games-2.11.4.new/configure.in	2005-08-21 13:33:14.000000000 -0400
+@@ -90,11 +90,17 @@
+ AC_SUBST(GLADE_LIBS)
+ 
+ ## Flags for Howl. Use of this library is optional.
+-PKG_CHECK_MODULES(HOWL, howl >= 0.9.6, [ HOWL_PRESENT="yes" ],
+-		  [ CFLAGS="$CFLAGS -DNO_HOWL"
++AC_ARG_ENABLE(howl, [ --disable-howl     build without howl support])
++if test "x$enable_howl" != "xno"; then
++ PKG_CHECK_MODULES(HOWL, howl >= 0.9.6, [ HOWL_PRESENT="yes" ],
++		   [ CFLAGS="$CFLAGS -DNO_HOWL"
+ 	            HOWL_PRESENT="no" ])
+-AC_SUBST(HOWL_CFLAGS)
+-AC_SUBST(HOWL_LIBS)
++ AC_SUBST(HOWL_CFLAGS)
++ AC_SUBST(HOWL_LIBS)
++else
++ CFLAGS="$CFLAGS -DNO_HOWL"
++ HOWL_PRESENT="no"
++fi
+ 
+ GNOME_GAMES_CXXFLAGS="$GNOME_GAMES_CFLAGS -I\$(top_srcdir)/libgames-support $WARN_CXXFLAGS"
+ GNOME_GAMES_CFLAGS="$GNOME_GAMES_CFLAGS -I\$(top_srcdir)/libgames-support $WARN_CFLAGS"
diff --git a/gnome-extra/gnome-games/gnome-games-2.11.4.ebuild b/gnome-extra/gnome-games/gnome-games-2.11.4.ebuild
new file mode 100644
index 000000000000..f915c29b071d
--- /dev/null
+++ b/gnome-extra/gnome-games/gnome-games-2.11.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.11.4.ebuild,v 1.1 2005/08/21 17:57:58 allanonjl Exp $
+
+inherit gnome2 eutils flag-o-matic
+
+DESCRIPTION="Collection of games for the GNOME desktop"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="guile artworkextra howl"
+
+RDEPEND=">=x11-libs/gtk+-2.5.4
+	>=gnome-base/gconf-2
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/librsvg-2
+	guile? ( >=dev-util/guile-1.6.5 )
+	artworkextra? ( gnome-extra/gnome-games-extra-data )
+	howl? ( >=net-misc/howl-0.9.6 )"
+
+DEPEND=">=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.29
+	>=sys-devel/gettext-0.10.40
+	>=app-text/scrollkeeper-0.3.8
+	${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README TODO"
+
+pkg_setup() {
+
+	G2CONF="${G2CONF} `use_enable howl` --disable-setgid"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-2.11.4-nohowl.patch
+
+	autoconf || die "autoconf failed"
+}
+
+src_install() {
+
+	# FIXME : for some reason this doesn't get picked up
+	append-ldflags "-Wl,-z,now"
+
+	gnome2_src_install
+	cd ${S}
+
+	# Documentation install for each of the games
+	for game in `find . -type d -maxdepth 1`
+	do
+		docinto ${game}
+		dodoc ${game}/{AUTHORS,ChangeLog,TODO,NEWS,README,COPYING} > /dev/null
+	done
+
+	rm -rf ${D}/usr/share/doc/${P}/{libgames-support,po}
+
+	# Avoid overwriting previous .scores files
+	local basefile
+	for scorefile in ${D}/var/lib/games/*.scores
+	do
+		basefile=$(basename $scorefile)
+		if [ -s "${ROOT}/var/lib/games/${basefile}" ]
+		then
+		rm ${scorefile}
+	fi
+	done
+
+}
+
+pkg_postinst() {
+
+	gnome2_pkg_postinst
+
+	einfo "For security reasons system wide scores are disabled by default from"
+	einfo "now on. To re-enable them, do 'chmod +s <exec>', where <exec> is all"
+	einfo "executables that 'qpkg -l -nc gnome-games | grep /usr/bin/' yields"
+	einfo "(requires gentoolkit)."
+
+}