version bump with additional patch work from Julian Ospald

(Portage version: 2.1.11.9/cvs/Linux x86_64)

4 files changed, 145 insertions, 13 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/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
+}