diff options
| -rw-r--r-- | games-board/xboard/ChangeLog | 10 | ||||
| -rw-r--r-- | games-board/xboard/files/xboard-4.4.4-gentoo.patch | 51 | ||||
| -rw-r--r-- | games-board/xboard/files/xboard-4.5.3a-gentoo.patch (renamed from games-board/xboard/files/xboard-4.5.1-gentoo.patch) | 82 | ||||
| -rw-r--r-- | games-board/xboard/xboard-4.4.4.ebuild | 70 | ||||
| -rw-r--r-- | games-board/xboard/xboard-4.5.2a.ebuild | 4 | ||||
| -rw-r--r-- | games-board/xboard/xboard-4.5.3a.ebuild (renamed from games-board/xboard/xboard-4.5.1.ebuild) | 7 |
6 files changed, 68 insertions, 156 deletions
diff --git a/games-board/xboard/ChangeLog b/games-board/xboard/ChangeLog index ed661c3fa604..77709a2fc5d0 100644 --- a/games-board/xboard/ChangeLog +++ b/games-board/xboard/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for games-board/xboard # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/ChangeLog,v 1.42 2011/09/20 14:36:55 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/ChangeLog,v 1.43 2011/11/02 01:10:36 mr_bones_ Exp $ + +*xboard-4.5.3a (02 Nov 2011) + + 02 Nov 2011; Michael Sterrett <mr_bones_@gentoo.org> -xboard-4.4.4.ebuild, + -files/xboard-4.4.4-gentoo.patch, -xboard-4.5.1.ebuild, + -files/xboard-4.5.1-gentoo.patch, xboard-4.5.2a.ebuild, + +xboard-4.5.3a.ebuild, +files/xboard-4.5.3a-gentoo.patch: + version bump; stable for x86; drop ppc to ~ (bug #375407) 20 Sep 2011; Michael Sterrett <mr_bones_@gentoo.org> xboard-4.4.4.ebuild, xboard-4.5.1.ebuild, xboard-4.5.2a.ebuild: diff --git a/games-board/xboard/files/xboard-4.4.4-gentoo.patch b/games-board/xboard/files/xboard-4.4.4-gentoo.patch deleted file mode 100644 index 4570b49c0527..000000000000 --- a/games-board/xboard/files/xboard-4.4.4-gentoo.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -ru xboard-4.4.4.orig/configure.ac xboard-4.4.4/configure.ac ---- xboard-4.4.4.orig/configure.ac 2010-08-18 18:50:06.000000000 -0400 -+++ xboard-4.4.4/configure.ac 2010-09-04 03:21:16.475299260 -0400 -@@ -125,26 +125,15 @@ - fi - - dnl | test if user wants ot use Xaw3d headers --AC_ARG_WITH([Xaw3d], -- [AS_HELP_STRING([--with-Xaw3d], -- [use Xaw3d instead of Xaw])], -- [with_xaw3d=yes], -- [with_xaw3d=no]) -- --XAW_LIBS= --AS_IF([test "x$with_xaw3d" != xno], -- [AC_CHECK_LIB([Xaw3d], -- [XawTextReplace], -- [AC_SUBST([XAW_LIBS], -- ["-lXaw3d"]) -- AC_DEFINE([USE_XAW3D], [1], -- [Define if you want to use Xaw3d])], -- [AC_CHECK_HEADER(X11/Xaw/Dialog.h,xaw_headers="yes") -- AC_MSG_FAILURE( -- [--with-Xaw3d was given, but test for Xaw3d failed])], -- [-lXaw])]) --if test "$with_xaw3d" = "no" ; then -- XAW_LIBS="-lXaw" -+AC_ARG_WITH(Xaw3d, -+[ --with-Xaw3d use Xaw3d instead of Xaw], -+[ with_xaw3d="$withval"], [enable_xaw3d="no"]) -+ -+if test "$withval" = yes; then -+ AC_DEFINE(USE_XAW3D) -+ XAW_LIBS="-lXaw3d" -+else -+ XAW_LIBS="-lXaw" - fi - AC_SUBST(XAW_LIBS) - -diff -ru xboard-4.4.4.orig/xboard.h xboard-4.4.4/xboard.h ---- xboard-4.4.4.orig/xboard.h 2010-08-18 18:47:46.000000000 -0400 -+++ xboard-4.4.4/xboard.h 2010-09-04 03:21:36.179926257 -0400 -@@ -104,7 +104,7 @@ - - #define BORDER_X_OFFSET 3 - #define BORDER_Y_OFFSET 27 --#define FIRST_CHESS_PROGRAM "fairymax" -+#define FIRST_CHESS_PROGRAM "gnuchess" - #define SECOND_CHESS_PROGRAM "fairymax" - - /* Default to no flashing (the "usual" XBoard behavior) */ diff --git a/games-board/xboard/files/xboard-4.5.1-gentoo.patch b/games-board/xboard/files/xboard-4.5.3a-gentoo.patch index 495ee48d7d34..56e1ba8e10eb 100644 --- a/games-board/xboard/files/xboard-4.5.1-gentoo.patch +++ b/games-board/xboard/files/xboard-4.5.3a-gentoo.patch @@ -1,24 +1,24 @@ -diff -ru xboard-4.5.1.orig/Makefile.am xboard-4.5.1/Makefile.am ---- xboard-4.5.1.orig/Makefile.am 2011-02-08 00:07:46.000000000 -0500 -+++ xboard-4.5.1/Makefile.am 2011-04-07 01:59:35.259757241 -0400 +diff -ru xboard-4.5.2a.orig/Makefile.am xboard-4.5.2a/Makefile.am +--- xboard-4.5.2a.orig/Makefile.am 2011-05-01 23:15:52.000000000 -0400 ++++ xboard-4.5.2a/Makefile.am 2011-05-06 17:24:16.268244229 -0400 @@ -33,14 +33,10 @@ $(ZPY) xboard_LDADD = -lm @XAW_LIBS@ @X_LIBS@ --EXTRA_DIST = pixmaps bitmaps winboard sounds filebrowser/README \ +-EXTRA_DIST = pixmaps bitmaps sounds winboard filebrowser/README \ - xboard.texi gpl.texinfo texi2man texinfo.tex xboard.man xboard.desktop \ - COPYRIGHT FAQ.html engine-intf.html ics-parsing.txt readme.htm zippy.README \ - xboard.conf.in SHORTLOG DIFFSTAT history.c - DISTCLEANFILES = stamp-h --AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @X_CFLAGS@ -DSYSCONFDIR='"$(sysconfdir)"' -DBITMAPDIR='"$(datadir)/games/xboard/bitmaps/"' -+bitmapdir = $(datadir) -+AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @X_CFLAGS@ -DSYSCONFDIR='"$(sysconfdir)"' -DBITMAPDIR='"$(bitmapdir)/"' +-AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @X_CFLAGS@ -DSYSCONFDIR='"$(sysconfdir)"' -DBITMAPDIR='"$(datadir)/games/xboard/bitmaps/default"' ++bitmapsdir = $(datadir)/default ++AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @X_CFLAGS@ -DSYSCONFDIR='"$(sysconfdir)"' -DBITMAPDIR='"$(bitmapsdir)"' info_TEXINFOS = xboard.texi xboard_TEXINFOS = copyright.texi -@@ -54,21 +50,20 @@ +@@ -54,21 +50,14 @@ ### icon files @@ -30,25 +30,45 @@ diff -ru xboard-4.5.1.orig/Makefile.am xboard-4.5.1/Makefile.am dist_svgicon_DATA = xboard.svg - ### desktop files for KDE and gnome - +-### desktop files for KDE and gnome +- -Applicationsdir = $(datadir)/applications -+Applicationsdir = /usr/share/applications - Applications_DATA = xboard.desktop +-Applications_DATA = xboard.desktop +- +- + ### directory and files for bitmaps +-bitmapsdir = $(datadir)/games/xboard/bitmaps/default + dist_bitmaps_DATA = \ + bitmaps/a33o.bm bitmaps/c45s.bm bitmaps/icon_outline.bm bitmaps/m49o.bm bitmaps/p45o.bm bitmaps/r29o.bm \ + bitmaps/a33s.bm bitmaps/c49o.bm bitmaps/icon_white.bm bitmaps/m49s.bm bitmaps/p45s.bm bitmaps/r29s.bm \ +@@ -137,13 +126,13 @@ - ### directory and files to be used as bitmaps + ### directory and files for pixmaps --bitmapdir = $(datadir)/games/xboard/ - dist_bitmap_DATA = pixmaps/wood_d.xpm pixmaps/wood_l.xpm +-pixmapsdir = $(datadir)/games/xboard/pixmaps/textures ++pixmapsdir = $(datadir)/pixmaps/textures + dist_pixmaps_DATA = pixmaps/wood_d.xpm pixmaps/wood_l.xpm -diff -ru xboard-4.5.1.orig/configure.ac xboard-4.5.1/configure.ac ---- xboard-4.5.1.orig/configure.ac 2011-02-20 19:11:12.000000000 -0500 -+++ xboard-4.5.1/configure.ac 2011-04-07 00:51:46.421901524 -0400 -@@ -133,30 +133,17 @@ + ### directory and files for sound files - dnl | test if user wants ot use Xaw3d or Xaw +-soundsdir = $(datadir)/games/xboard/sounds ++soundsdir = $(datadir)/sounds + dist_sounds_DATA = \ + sounds/cymbal.wav sounds/pop2.wav sounds/slap.wav sounds/ding1.wav sounds/laser.wav \ + sounds/woodthunk.wav sounds/gong.wav sounds/penalty.wav sounds/honkhonk.wav sounds/phone.wav +diff -ru xboard-4.5.2a.orig/configure.ac xboard-4.5.2a/configure.ac +--- xboard-4.5.2a.orig/configure.ac 2011-05-01 23:17:29.000000000 -0400 ++++ xboard-4.5.2a/configure.ac 2011-05-06 17:24:16.268244229 -0400 +@@ -131,32 +131,17 @@ + exit 1 + fi + +-dnl | test if user wants ot use Xaw3d or Xaw ++AC_ARG_WITH(Xaw3d, ++[ --with-Xaw3d use Xaw3d instead of Xaw], ++[ with_xaw3d="$withval"], [enable_xaw3d="no"]) -dnl | add configure option for Xaw3d -AC_ARG_WITH([Xaw3d], @@ -73,10 +93,6 @@ diff -ru xboard-4.5.1.orig/configure.ac xboard-4.5.1/configure.ac - AC_MSG_ERROR([Xaw headers not found. Please install the Xaw package and headers.]) - fi - XAW_LIBS="-lXaw" -+AC_ARG_WITH(Xaw3d, -+[ --with-Xaw3d use Xaw3d instead of Xaw], -+[ with_xaw3d="$withval"], [enable_xaw3d="no"]) -+ +if test "$withval" = yes; then + AC_DEFINE(USE_XAW3D) + XAW_LIBS="-lXaw3d" @@ -87,9 +103,21 @@ diff -ru xboard-4.5.1.orig/configure.ac xboard-4.5.1/configure.ac AC_SUBST(XAW_LIBS) dnl | end Xaw/Xaw3d test -diff -ru xboard-4.5.1.orig/xboard.h xboard-4.5.1/xboard.h ---- xboard-4.5.1.orig/xboard.h 2011-02-03 11:36:36.000000000 -0500 -+++ xboard-4.5.1/xboard.h 2011-04-07 00:51:46.422901324 -0400 +diff -ru xboard-4.5.2a.orig/xboard.conf.in xboard-4.5.2a/xboard.conf.in +--- xboard-4.5.2a.orig/xboard.conf.in 2011-05-01 23:15:52.000000000 -0400 ++++ xboard-4.5.2a/xboard.conf.in 2011-05-06 17:24:29.271622485 -0400 +@@ -57,7 +57,7 @@ + ; + ; Engines & adjudicatons in engine-engine games + ; +--firstChessProgram fairymax ++-firstChessProgram gnuchess + -secondChessProgram fairymax + -niceEngines 0 + -polyglotDir "" +diff -ru xboard-4.5.2a.orig/xboard.h xboard-4.5.2a/xboard.h +--- xboard-4.5.2a.orig/xboard.h 2011-05-01 23:15:52.000000000 -0400 ++++ xboard-4.5.2a/xboard.h 2011-05-06 17:24:16.268244229 -0400 @@ -104,7 +104,7 @@ #define BORDER_X_OFFSET 3 diff --git a/games-board/xboard/xboard-4.4.4.ebuild b/games-board/xboard/xboard-4.4.4.ebuild deleted file mode 100644 index d2867cfff8ee..000000000000 --- a/games-board/xboard/xboard-4.4.4.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.4.4.ebuild,v 1.6 2011/09/20 14:36:55 mr_bones_ Exp $ - -EAPI=2 -inherit autotools eutils games - -DESCRIPTION="GUI for gnuchess and for internet chess servers" -HOMEPAGE="http://www.gnu.org/software/xboard/" -SRC_URI="mirror://gnu/xboard/${P}.tar.gz - mirror://gentoo/${PN}.png" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="ppc ~ppc64 x86" -IUSE="Xaw3d +default-font zippy" -RESTRICT="test" #124112 - -RDEPEND="Xaw3d? ( x11-libs/libXaw3d ) - x11-libs/libXpm - x11-libs/libXaw - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXt - x11-libs/libXmu - x11-libs/libXext - x11-libs/libICE - default-font? ( media-fonts/font-adobe-100dpi )" -DEPEND="${RDEPEND} - x11-proto/xproto" - -src_unpack() { - unpack ${P}.tar.gz -} - -src_prepare() { - epatch "${FILESDIR}"/${P}* - sed -i \ - -e '/icons/s:\$(datadir):/usr/share:' \ - Makefile.am \ - || die 'sed failed' - eautoreconf -} - -src_configure() { - egamesconf \ - --disable-dependency-tracking \ - $(use_with Xaw3d) \ - $(use_enable zippy) -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS COPYRIGHT ChangeLog NEWS README TODO ics-parsing.txt - use zippy && dodoc zippy.README - dohtml FAQ.html - doicon "${DISTDIR}"/xboard.png - make_desktop_entry ${PN} "Xboard (Chess)" - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - elog "No chess engines are emerged by default! If you want a chess engine" - elog "to play with, you can emerge gnuchess or crafty." - elog "Read xboard FAQ for information." - if ! use default-font ; then - ewarn "Read the xboard(6) man page for specifying the font for xboard to use." - fi -} diff --git a/games-board/xboard/xboard-4.5.2a.ebuild b/games-board/xboard/xboard-4.5.2a.ebuild index 951363d7bf35..aecb479f596c 100644 --- a/games-board/xboard/xboard-4.5.2a.ebuild +++ b/games-board/xboard/xboard-4.5.2a.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.5.2a.ebuild,v 1.3 2011/09/20 14:36:55 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.5.2a.ebuild,v 1.4 2011/11/02 01:10:36 mr_bones_ Exp $ EAPI=2 inherit autotools eutils games @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/xboard/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~ppc ~ppc64 ~x86" +KEYWORDS="~ppc ~ppc64 x86" IUSE="Xaw3d +default-font zippy" RESTRICT="test" #124112 diff --git a/games-board/xboard/xboard-4.5.1.ebuild b/games-board/xboard/xboard-4.5.3a.ebuild index 9cbc28d13def..43256c22b148 100644 --- a/games-board/xboard/xboard-4.5.1.ebuild +++ b/games-board/xboard/xboard-4.5.3a.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.5.1.ebuild,v 1.3 2011/09/20 14:36:55 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.5.3a.ebuild,v 1.1 2011/11/02 01:10:36 mr_bones_ Exp $ EAPI=2 inherit autotools eutils games @@ -35,16 +35,13 @@ src_unpack() { src_prepare() { epatch "${FILESDIR}"/${P}* - sed -i \ - -e '/icons/s:\$(datadir):/usr/share:' \ - Makefile.am \ - || die 'sed failed' eautoreconf } src_configure() { egamesconf \ --disable-dependency-tracking \ + --datadir="${GAMES_DATADIR}"/${PN} \ $(use_with Xaw3d) \ $(use_enable zippy) } |