restore new version and add font fix

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

diff --git a/games-board/gnubg/ChangeLog b/games-board/gnubg/ChangeLog
index 8fadea77ba3b0929b8ffbc9563675473a54d75a5..cd3828f7b9c146bfee8cd21773b923811b17064c 100644 (file)
--- a/games-board/gnubg/ChangeLog
+++ b/games-board/gnubg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-board/gnubg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/ChangeLog,v 1.79 2014/12/13 20:40:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/ChangeLog,v 1.80 2014/12/13 21:34:51 mr_bones_ Exp $
+
+*gnubg-1.04.000 (13 Dec 2014)
+
+  13 Dec 2014; Michael Sterrett <mr_bones_@gentoo.org> +gnubg-1.04.000.ebuild,
+  -gnubg-20130203-r1.ebuild:
+  restore new version and add font fix
 
 *gnubg-20130203-r1 (13 Dec 2014)
 

diff --git a/games-board/gnubg/Manifest b/games-board/gnubg/Manifest
index 7b7f65e8ef3c662d65c8bcc03b240a5fd4508142..8a852f7e58188d7a551e01f6e607f3fb82d8487a 100644 (file)
--- a/games-board/gnubg/Manifest
+++ b/games-board/gnubg/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gnubg-20130203-build.patch 1738 SHA256 008204aaaf5924eba43cfea8ead1a60270a341a1251edf327c866d597d6f04e8 SHA512 a1aed4593122819574e70bdd790be2b39c23412f4ffb0b62cb9c093766c8cd863258010cedf5280cca2bce530ca0c933e56139af68f810f143519a49d27d50d4 WHIRLPOOL 1b62f7f1fae9d779cbf62a6e67cc478b2906f921a8cc242e8cdd2395c0d67538cec5d651d4aa32aae37d3eaf93fd4fcbaa22f4177dcdd23754d52792047da39b
+DIST gnubg-release-1.04.000-sources.tar.gz 15021543 SHA256 66ca950d33d697f7a87605dfd3b83165ed756a927eaef164684914b9b0a14e3f SHA512 6f83d631d2978ef91829dd69a7de704eb4f194b7854bcebc5254315cd48bc09abf80ef27ba2b063514d2689313ffac7b4f20c62af6bf8ae3496f261ab25fe80c WHIRLPOOL 787ef3c8d33a475810aac5cba799001d435385554672a00c832dd1870006841bcd270f2bb6d77e9c990fa58300ced3d50a2a78cc2ae9f1ae94b30ef0c17c10a2
 DIST gnubg-source-SNAPSHOT-20130203.tar.gz 14336279 SHA256 b996e742f06995de097f7658a20a51f5f6c23ba3cb7d88ca3b2a211b272674d9 SHA512 3f559d9bbaa225671b35d3bea7b1373d4297226adeb43acf95b4898ee51c747564fd4365c7b371098e58653cba15361c32cfb99b0804a1991bf195679295ea65 WHIRLPOOL 5882efff6e1a244271ca09a63923c74222ed4111a48f2e312bc9b40f0e518615642e88cd645a9f312186088b7baa91a3261c4422be90e9e2932af99696a61f85
-EBUILD gnubg-20130203-r1.ebuild 2350 SHA256 815aa1aa903e585cfe8e9d45ae34a7125e8b8858e828517b0635b3be272c818b SHA512 6937bb7b548684a87a2b806ad8f72bf132fa421358c34dea5004e6a839558178ba8aca09b969930b9f8149215eb989baab7d827014cca57f9d40f8d0a7cac26e WHIRLPOOL 95546784fdcfc8cf7e2d8119557a91eed924e855fa0e7cfb9680ba9e9c2a9b384efcfb92af1f2bc96a954ce2fa423aff0d1a8ecc70f88c3f9d019c5cb0c4a81f
+EBUILD gnubg-1.04.000.ebuild 2652 SHA256 d6a7daca9b7508464407cbe57462f239ed56e8676a13c9bf8a2f541630db17f1 SHA512 44cfb82926ba8e5b85ca8ee0b477e0f327ece07db5fc66c4528bfb619464e0c6d1e8d74b7a23d0e6af088e5f54a66bc81f0e95a3101d7611dc036f08f98bc5f0 WHIRLPOOL 52053d076bce871aaab818a2eb5af3e8c581466701c4e2020e4b61bd776c6affff9d351ecbf45e61af536f087c4447a0624bb773d51aa541a63d8794046376a1
 EBUILD gnubg-20130203.ebuild 2149 SHA256 470cb53200bf2d22928d9881c860e10f6ccf3c9e4261d48de92f0fe6297ce75e SHA512 274b5ccf4a229f8c267de43e242a34008983fe75c3175d5cab597f013ef9a49fd59026d0c668586d283e6e5fbe9279253c093ee9ed79c795d46eeef3d04b1184 WHIRLPOOL 37b3f43602b3ed3d237a2d14ad5f5bf4dc3b5d6fd89fb1ede1aaaced33b4da2391ea84e502b09a4f11bb9d42139a745138f9a96333f6409f95803c433732cf3f
-MISC ChangeLog 10644 SHA256 d1ffdeccffd945032a51008f202933897a1dfe4e8b089cc92b388f77d8e85f0e SHA512 81f489b2a1d7569b36c19beaeceeeb5054f7a562020a453daf44df75c5ae5230a26256b1d1e394645e943f425bf570b8e4e19399f2f83f0157fe090d306dd7c2 WHIRLPOOL 5e467ddb11fb9d4ed71099594ca7f32a6a81d3010fd674eea4d84b7baabe1a34fed1e58920e1a42f518c6fc681df9344a17fb05be00ca0b42b476ae466c5b5db
+MISC ChangeLog 10827 SHA256 7c932a0caa66da195cf5074cd5c877eeba733187b7359551725957fd356c3e3e SHA512 67d997cd5004cf1a4478bdf69c2ac7523f9859a76fcc4ac158456a0ede6c05c4c2cdb59f812f023565017761f95e33ab431df986c9bea5a35bc95331f46dca95 WHIRLPOOL 78b60024668ddfe3523098619979db5248796dc2bf30acebb8ca16a5f8ba8c492e2835556ce1c8b9394f577f5e8073548d534d04bd56cfd47982a3c987439428
 MISC metadata.xml 251 SHA256 34f41062e84f1e12c08550faffc97632a2432df3579520cec76dbe8b08fb9cfe SHA512 6aee7ba0f0c5615fd2e3bc3b7ee827dd12f469c157f21ce326a6ea15633169812c7ed54f1c24b515285eece0f09bef176944b4f7d9ab004120cc11afb9c45e42 WHIRLPOOL e5384ae4b6e662670512ab747fd5e62ddece6ab467cf991e044b8e421164419ed30597392ab62c1779158695ad35f00ab9921ef1e25fe8f5b540a8043adb90b3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlSMpEoACgkQCaWpQKGI+9Rz1ACdE7YfC9i25vuHTI0MoKBEM+cn
-ay4AniEeuB6k3UUH4vPKCB7iOMfpLA5K
-=cHYj
------END PGP SIGNATURE-----

diff --git a/games-board/gnubg/gnubg-20130203-r1.ebuild b/games-board/gnubg/gnubg-1.04.000.ebuild
similarity index 61%
rename from games-board/gnubg/gnubg-20130203-r1.ebuild
rename to games-board/gnubg/gnubg-1.04.000.ebuild
index 9996fa45c0e859fe3e1a1ad7dc88fad7ddf7ae68..9b431c11d93966143a1a32bdc80e97c83c5748e3 100644 (file)
--- a/games-board/gnubg/gnubg-20130203-r1.ebuild
+++ b/games-board/gnubg/gnubg-1.04.000.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/gnubg-20130203-r1.ebuild,v 1.1 2014/12/13 20:40:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/gnubg-1.04.000.ebuild,v 1.3 2014/12/13 21:34:51 mr_bones_ Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_6 python2_7 )
@@ -8,39 +8,36 @@ inherit autotools eutils python-single-r1 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"
+SRC_URI="http://gnubg.org/media/sources/${PN}-release-${PV}-sources.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="gtk opengl python threads"
+IUSE="avx gtk opengl python sqlite3 sse sse2 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/libpng:0
+       x11-libs/cairo
+       x11-libs/pango
+       dev-db/sqlite:3
        media-libs/libcanberra
-       gtk? ( ${GTK_DEPS} )
+       dev-libs/libxml2
+       dev-libs/gmp:0
+       gtk? ( x11-libs/gtk+:2 )
        opengl? (
-               ${GTK_DEPS}
+               x11-libs/gtk+:2
                x11-libs/gtkglext
-               >=media-libs/ftgl-2.1.2-r1
+               virtual/glu
        )
        sys-libs/readline
        python? ( ${PYTHON_DEPS} )
        media-fonts/dejavu
-       virtual/libintl
-       dev-db/sqlite:3"
+       virtual/libintl"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
        sys-devel/gettext"
 
-S=${WORKDIR}/${PN}
-
 pkg_setup() {
        games_pkg_setup
        python-single-r1_pkg_setup
@@ -49,21 +46,36 @@ pkg_setup() {
 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
-       eautoreconf
+       sed -i -e 's/fonts //' Makefile.in || die # handle font install ourself to fix bug #335774
        sed -i \
-               -e 's#^localedir =.*$#localedir = @localedir@#' \
-               -e 's#^gnulocaledir =.*$#gnulocaledir = @localedir@#' \
+               -e '/^localedir / s#=.*$#= @localedir@#' \
+               -e '/^gnulocaledir / s#=.*$#= @localedir@#' \
                po/Makefile.in.in || die
+       sed -i \
+               -e '/^gnubgiconsdir / s#=.*#= /usr/share#' \
+               -e '/^gnubgpixmapsdir / s#=.*#= /usr/share/pixmaps#' \
+               pixmaps/Makefile.in || die
 }
 
 src_configure() {
+       local simd=no
+       local gtk_arg=--without-gtk
+
+       if use gtk || use opengl ; then
+               gtk_arg=--with-gtk
+       fi
+       use sse  && simd=sse
+       use sse2 && simd=sse2
+       use avx  && simd=avx
        egamesconf \
                --localedir=/usr/share/locale \
                --docdir=/usr/share/doc/${PF}/html \
+               --disable-cputest \
+               --enable-simd=${simd} \
+               ${gtk_arg} \
                $(use_enable threads) \
                $(use_with python) \
-               $(use gtk || use opengl && echo --with-gtk) \
+               $(use_with sqlite3 sqlite) \
                $(use_with opengl board3d)
 }
 
@@ -71,13 +83,10 @@ src_install() {
        default
        insinto "${GAMES_DATADIR}/${PN}"
        doins ${PN}.weights *bd
-
-       rm -rf "${D}/${GAMES_DATADIR}"/${PN}/fonts/*.ttf
+       dodir "${GAMES_DATADIR}"/${PN}/fonts
        dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}"/${PN}/fonts/Vera.ttf
        dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/fonts/VeraBd.ttf
        dosym /usr/share/fonts/dejavu/DejaVuSerif-Bold.ttf "${GAMES_DATADIR}"/${PN}/fonts/VeraSeBd.ttf
-
-       newicon -s 128 textures/logo.png gnubg.png
        make_desktop_entry "gnubg -w" "GNU Backgammon"
        prepgamesdirs
 }