version bump with additional patch work from Julian Ospald

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

5 files changed, 153 insertions, 18 deletions

diff --git a/games-board/gnubg/ChangeLog b/games-board/gnubg/ChangeLog
index af43acf545c8..4a6d48ecb189 100644
--- a/games-board/gnubg/ChangeLog
+++ b/games-board/gnubg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-board/gnubg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/ChangeLog,v 1.59 2012/05/04 04:30:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/ChangeLog,v 1.60 2012/09/03 07:56:48 mr_bones_ Exp $
+
+*gnubg-20120806 (03 Sep 2012)
+
+  03 Sep 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  files/gnubg-20101126-build.patch, +gnubg-20120806.ebuild,
+  +files/gnubg-20120806-build.patch:
+  version bump with additional patch work from Julian Ospald
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> gnubg-20101126.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/games-board/gnubg/Manifest b/games-board/gnubg/Manifest
index 21103c068938..d86e29e25454 100644
--- a/games-board/gnubg/Manifest
+++ b/games-board/gnubg/Manifest
@@ -1,5 +1,8 @@
-AUX gnubg-20101126-build.patch 2380 RMD160 c8798017d8780dac0bc5b01007a3e3db14b5f989 SHA1 ae9be93cf21dffba38d8f1d8b45ed9bbbc9ba8fe SHA256 26f94c0d264fa52c371173de78129d74a76581a9101cf95e32e2658478c00ea8
-DIST gnubg-source-SNAPSHOT-20101126.tar.gz 14192800 RMD160 08360a017b06c432a9fe2c621e63c3bafdb88abd SHA1 a75c56774ce3ee62c03846175641def0291587d6 SHA256 84936b5264d4789426370bd9d88e1920748a2c74ed700070310a68435b6933c7
-EBUILD gnubg-20101126.ebuild 1943 RMD160 540951691fe3a99b2bf43a721163444dc2336e05 SHA1 00d8906566b81729aad91f235546ecbb4a17e5e2 SHA256 de4a4b7bc0505bf23cc1e768862bc2c0e752549a0c5f52f582d79d1577d2eafa
-MISC ChangeLog 7968 RMD160 36853dcfbab7785444d4d470301cc1f8c177209c SHA1 e2a5cfe300161d8863712e97781de260306fee4b SHA256 8f9c2bde278dcfc1a0782ad4ab556ce3d94ed0dec5259b585c8422e81de2e2d5
-MISC metadata.xml 251 RMD160 f77a8fea97ab2a02ef2d9bf1cc7b390c5c19e6cb SHA1 8134d1f2611a2e4387a89e84580a2cb5c25f5649 SHA256 34f41062e84f1e12c08550faffc97632a2432df3579520cec76dbe8b08fb9cfe
+AUX gnubg-20101126-build.patch 1856 SHA256 ea7b29f286a4fc0ba1e93b19cab43fb2dcdd0b1e0960fa9d10d54e1da6547b2f SHA512 fc1de06856ce5ffaa70df6c8f857c1a2e756b8401915dff5b49ad76205e42e2708cf234ae9248c1546cac3a760fbfe98b8775d551fc0fdd00f23884e8b28f449 WHIRLPOOL 6213fd32381036316e066be176522a1eaf0f983b435ed8a26e59cab59dec8691233ade59bcada8308739cffaeb09b9ac1d777fb93cb62d791210f7f562de67be
+AUX gnubg-20120806-build.patch 1399 SHA256 5d291a5a1ac777fbd9a53e008ba641f3c47099bc80a3d0eb4db450a91694c3f0 SHA512 ece8240c8713cefb103a5c8654dc4deefcbbebed743277dcb71b2e955a39ae9b1b6ef17116af700a84629c90fb1731f8e953544c78cd381b129a15e6e8a2e968 WHIRLPOOL 8d5431a885a36a76064c1f33768b358ef062bdfffd6253dcf8391eb05e9b283b665fbfe600279155c557e807bad854e48e66232abb4317ff31df4dcb5858500b
+DIST gnubg-source-SNAPSHOT-20101126.tar.gz 14192800 SHA256 84936b5264d4789426370bd9d88e1920748a2c74ed700070310a68435b6933c7 SHA512 358b48ce9dc85893d5bb5dfc306d54eef1607cbf27e23a700f38c078340a7e74cda062b7467cbfcc4dc63bda1e42e7e39a597574848f868752f4f1c3ad39a58d WHIRLPOOL 8182f99cb2ab72c838fd377b6143f962fe7163f0c75e7b2e6789eacd899c4ccd87754914187a42b7a2e839aa15a6ecef82152bbb00797d49dad41be3280cf026
+DIST gnubg-source-SNAPSHOT-20120806.tar.gz 14333498 SHA256 63dfefc80e4ff4ab3eb7866d42f90bef89ecca590bfeef82a2426a6ad90dd20d SHA512 b794b5b9f5cdc5a4c4e8caac12ed4be23c023ba6ba7f9a42757957659d95484e458959755f3e051daa6ceeeae7fec7c487b75b653bb341a15c816aa68291ed98 WHIRLPOOL 15aaba0c170c2a0b237379d6b177b69a2802b942092ee2a4e5533b3e05c912d764d2c03b7e6b6f8a517fbb2be7043207b55309aeb0987db959d30cbf9d48121d
+EBUILD gnubg-20101126.ebuild 1943 SHA256 de4a4b7bc0505bf23cc1e768862bc2c0e752549a0c5f52f582d79d1577d2eafa SHA512 0096ee218800d3bfd2b146bd42e86aaea0995532406cc9f962280fe5223d3e7a78862f42eddaff75b3aa9bf7dc1afe60bdeb6500d04f54108a8a6d099b356d15 WHIRLPOOL 85006a74afc51412be8b2fa074d87339bca498b69cb4c031f012846abf99e60e48ecfe5f4d5310f79951085460bbd2b6198d48680a08000c76b629fbcacb883a
+EBUILD gnubg-20120806.ebuild 2241 SHA256 3c788f78116427e3598c9dfc9ccccb55a637f28704f008f0f56d59ff94f65cb7 SHA512 817ce6df221aab681f9372ab13a2b285f4ac5a3c653622d5243bb9c82ef3b06f52dd0d3c8c81ec688269938ce6ba418fa85827e2b284afc6b88ecbff2ad16a3b WHIRLPOOL 09f6c3ec7f012d5efd1d0d407892d4529f257ce5e31197245c5bda3ffc8febe6ebeee379a3162412cfeda06e80116cbc1345201b00428bb963fb73af001b8693
+MISC ChangeLog 8216 SHA256 d8f3252138041d2e088d52b1881f01c281cf0863c9573251907d2eb99b5f2e2b SHA512 cb396c66fc06636a30a33e3b09060192b18cd8734464236ff9215e51250051750a16494811f6af216b009f6ecb6099575aaec2a72f05257df1d21783ae6bccaa WHIRLPOOL df490dacc68e0f18244b5d8104bf7b03d5fe5e43fd86a7b051719fdfed3ab8cf3358a89cd989d48514f9cc3ef259aff9b90130f4b34253826861f1002b344392
+MISC metadata.xml 251 SHA256 34f41062e84f1e12c08550faffc97632a2432df3579520cec76dbe8b08fb9cfe SHA512 6aee7ba0f0c5615fd2e3bc3b7ee827dd12f469c157f21ce326a6ea15633169812c7ed54f1c24b515285eece0f09bef176944b4f7d9ab004120cc11afb9c45e42 WHIRLPOOL e5384ae4b6e662670512ab747fd5e62ddece6ab467cf991e044b8e421164419ed30597392ab62c1779158695ad35f00ab9921ef1e25fe8f5b540a8043adb90b3
diff --git a/games-board/gnubg/files/gnubg-20101126-build.patch b/games-board/gnubg/files/gnubg-20101126-build.patch
index 089d23597cde..7251cda92c5e 100644
--- a/games-board/gnubg/files/gnubg-20101126-build.patch
+++ b/games-board/gnubg/files/gnubg-20101126-build.patch
@@ -1,6 +1,5 @@
-diff -ru gnubg.orig/Makefile.am gnubg/Makefile.am
---- gnubg.orig/Makefile.am	2009-08-08 22:30:04.000000000 -0400
-+++ gnubg/Makefile.am	2009-08-20 02:13:01.696689411 -0400
+--- gnubg.orig/Makefile.am
++++ gnubg/Makefile.am
 @@ -2,9 +2,9 @@
  
  ACLOCAL_AMFLAGS = -I m4
@@ -13,9 +12,8 @@ diff -ru gnubg.orig/Makefile.am gnubg/Makefile.am
  
  bin_PROGRAMS = gnubg makebearoff makehyper bearoffdump makeweights
  
-diff -ru gnubg.orig/doc/Makefile.am gnubg/doc/Makefile.am
---- gnubg.orig/doc/Makefile.am	2009-08-08 22:30:05.000000000 -0400
-+++ gnubg/doc/Makefile.am	2009-08-20 02:10:53.969939597 -0400
+--- gnubg.orig/doc/Makefile.am
++++ gnubg/doc/Makefile.am
 @@ -1,6 +1,6 @@
 -AM_CPPFLAGS = -DDOCDIR='"$(datadir)/doc/gnubg/"' -DDATADIR='"$(datadir)"' -DPKGDATADIR='"$(datadir)/gnubg"'
 -gnubg_helpdir = $(datadir)/doc/gnubg/
@@ -26,9 +24,8 @@ diff -ru gnubg.orig/doc/Makefile.am gnubg/doc/Makefile.am
  gnubg_help_DATA =  gnubg.html allabout.html
  gnubg_image_DATA = images/1540d81e.png images/16d7944c.png images/1805dc7d.png \
  		   images/20bc52ca.png images/20d56757.png images/234924dc.png images/26e34ea5.png \
-diff -ru gnubg.orig/pixmaps/Makefile.am gnubg/pixmaps/Makefile.am
---- gnubg.orig/pixmaps/Makefile.am	2008-12-08 22:30:08.000000000 -0500
-+++ gnubg/pixmaps/Makefile.am	2009-08-20 02:12:00.050689327 -0400
+--- gnubg.orig/pixmaps/Makefile.am
++++ gnubg/pixmaps/Makefile.am
 @@ -1,5 +1,5 @@
 -gnubgiconsdir = $(datadir)
 -gnubgpixmapsdir = $(pkgdatadir)/pixmaps
@@ -37,9 +34,8 @@ diff -ru gnubg.orig/pixmaps/Makefile.am gnubg/pixmaps/Makefile.am
  
  ICONS_16_SCALABLE = icons/hicolor/16x16/apps/scalable/gnubg.svg
  ICONS_16 = icons/hicolor/16x16/apps/gnubg.png
-diff -ru gnubg.orig/po/Makefile.in.in gnubg/po/Makefile.in.in
---- gnubg.orig/po/Makefile.in.in	2008-09-29 22:30:08.000000000 -0400
-+++ gnubg/po/Makefile.in.in	2009-08-20 02:09:51.838814286 -0400
+--- gnubg.orig/po/Makefile.in.in
++++ gnubg/po/Makefile.in.in
 @@ -28,8 +28,8 @@
  datarootdir = @datarootdir@
  datadir = @datadir@
diff --git a/games-board/gnubg/files/gnubg-20120806-build.patch b/games-board/gnubg/files/gnubg-20120806-build.patch
new file mode 100644
index 000000000000..f5a94750733c
--- /dev/null
+++ b/games-board/gnubg/files/gnubg-20120806-build.patch
@@ -0,0 +1,33 @@
+--- gnubg.orig/Makefile.am
++++ gnubg/Makefile.am
+@@ -2,7 +2,7 @@
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-AM_CPPFLAGS = -DAC_DOCDIR='"$(datadir)/doc/gnubg/"' -DAC_DATADIR='"$(datadir)"' -DAC_PKGDATADIR='"$(datadir)/gnubg"'
++AM_CPPFLAGS = -DAC_DOCDIR='"@docdir@"' -DAC_DATADIR='"$(datadir)"' -DAC_PKGDATADIR='"$(datadir)/gnubg"'
+ 
+ SUBDIRS = lib doc met po m4 sounds board3d textures scripts flags fonts non-src pixmaps .
+ 
+--- gnubg.orig/doc/Makefile.am
++++ gnubg/doc/Makefile.am
+@@ -1,6 +1,6 @@
+-AM_CPPFLAGS = -DAC_DOCDIR='"$(datadir)/doc/gnubg/"' -DAC_DATADIR='"$(datadir)"' -DAC_PKGDATADIR='"$(datadir)/gnubg"'
+-gnubg_helpdir = $(datadir)/doc/gnubg/
+-gnubg_imagedir = $(datadir)/doc/gnubg/images
++AM_CPPFLAGS = -DAC_DOCDIR='"@docdir@"' -DAC_DATADIR='"$(datadir)"' -DAC_PKGDATADIR='"$(datadir)/gnubg"'
++gnubg_helpdir = @docdir@ 
++gnubg_imagedir = @docdir@/images
+ gnubg_help_DATA =  gnubg.html allabout.html
+ gnubg_image_DATA = images/1540d81e.png images/16d7944c.png images/1805dc7d.png \
+ 		   images/20bc52ca.png images/20d56757.png images/234924dc.png images/26e34ea5.png \
+--- gnubg.orig/pixmaps/Makefile.am
++++ gnubg/pixmaps/Makefile.am
+@@ -1,5 +1,5 @@
+-gnubgiconsdir = $(datadir)
+-gnubgpixmapsdir = $(pkgdatadir)/pixmaps
++gnubgiconsdir = /usr/share
++gnubgpixmapsdir = /usr/share/pixmaps
+ 
+ ICONS_16_SCALABLE = icons/hicolor/16x16/apps/scalable/gnubg.svg
+ ICONS_16 = icons/hicolor/16x16/apps/gnubg.png
diff --git a/games-board/gnubg/gnubg-20120806.ebuild b/games-board/gnubg/gnubg-20120806.ebuild
new file mode 100644
index 000000000000..ac69582211b4
--- /dev/null
+++ b/games-board/gnubg/gnubg-20120806.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/gnubg-20120806.ebuild,v 1.1 2012/09/03 07:56:48 mr_bones_ Exp $
+
+EAPI=4
+PYTHON_DEPEND="python? 2"
+inherit autotools eutils python gnome2-utils games
+
+DESCRIPTION="GNU BackGammon"
+HOMEPAGE="http://www.gnubg.org/"
+SRC_URI="http://www.gnubg.org/media/sources/${PN}-source-SNAPSHOT-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="gtk opengl python threads"
+
+GTK_DEPS="
+	x11-libs/gtk+:2
+	x11-libs/cairo
+	x11-libs/pango"
+RDEPEND="dev-libs/glib:2
+	media-libs/libpng:0
+	dev-libs/libxml2
+	media-libs/freetype:2
+	media-libs/libcanberra
+	gtk? ( ${GTK_DEPS} )
+	opengl? (
+		${GTK_DEPS}
+		x11-libs/gtkglext
+		>=media-libs/ftgl-2.1.2-r1
+	)
+	sys-libs/readline
+	python? ( dev-lang/python )
+	media-fonts/ttf-bitstream-vera
+	virtual/libintl
+	dev-db/sqlite:3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	python_pkg_setup
+	games_pkg_setup
+	python_set_active_version 2
+}
+
+src_prepare() {
+	# use ${T} instead of /tmp for constructing credits (bug #298275)
+	sed -i -e 's:/tmp:${T}:' credits.sh || die
+	epatch "${FILESDIR}"/${P}-build.patch
+	python_convert_shebangs -r 2 python-config
+	eautoreconf
+	sed -i \
+		-e 's#^localedir =.*$#localedir = @localedir@#' \
+		-e 's#^gnulocaledir =.*$#gnulocaledir = @localedir@#' \
+		po/Makefile.in.in || die
+}
+
+src_configure() {
+	egamesconf \
+		--disable-dependency-tracking \
+		--localedir=/usr/share/locale \
+		--docdir=/usr/share/doc/${PF}/html \
+		$(use_enable threads) \
+		$(use_with python) \
+		$(use gtk || use opengl && echo --with-gtk) \
+		$(use_with opengl board3d)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins ${PN}.weights *bd
+	dodoc AUTHORS README NEWS
+	dosym /usr/share/fonts/ttf-bitstream-vera "${GAMES_DATADIR}"/${PN}/fonts/ttf-bitstream-vera
+	newicon textures/logo.png gnubg.png
+	make_desktop_entry "gnubg -w" "GNU Backgammon"
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}