diff options
-rw-r--r-- | games-puzzle/sgt-puzzles/ChangeLog | 8 | ||||
-rw-r--r-- | games-puzzle/sgt-puzzles/files/sgt-puzzles-9023-gentoo.patch | 22 | ||||
-rw-r--r-- | games-puzzle/sgt-puzzles/sgt-puzzles-9023.ebuild | 74 |
3 files changed, 103 insertions, 1 deletions
diff --git a/games-puzzle/sgt-puzzles/ChangeLog b/games-puzzle/sgt-puzzles/ChangeLog index 1b60576b6a04..1a994e31f09c 100644 --- a/games-puzzle/sgt-puzzles/ChangeLog +++ b/games-puzzle/sgt-puzzles/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for games-puzzle/sgt-puzzles # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/ChangeLog,v 1.7 2010/09/21 20:31:58 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/ChangeLog,v 1.8 2010/11/28 05:52:31 mr_bones_ Exp $ + +*sgt-puzzles-9023 (28 Nov 2010) + + 28 Nov 2010; Michael Sterrett <mr_bones_@gentoo.org> + +sgt-puzzles-9023.ebuild, +files/sgt-puzzles-9023-gentoo.patch: + version bump (bug #346831) 21 Sep 2010; Markos Chandras <hwoarang@gentoo.org> sgt-puzzles-8972.ebuild: diff --git a/games-puzzle/sgt-puzzles/files/sgt-puzzles-9023-gentoo.patch b/games-puzzle/sgt-puzzles/files/sgt-puzzles-9023-gentoo.patch new file mode 100644 index 000000000000..31e7f796a611 --- /dev/null +++ b/games-puzzle/sgt-puzzles/files/sgt-puzzles-9023-gentoo.patch @@ -0,0 +1,22 @@ +--- mkfiles.pl.old 2010-03-07 11:14:11.000000000 -0300 ++++ mkfiles.pl 2010-03-07 11:24:20.000000000 -0300 +@@ -1110,8 +1110,8 @@ + "\n". + &splitline("CFLAGS := -O2 -Wall -Werror -ansi -pedantic -g " . + (join " ", map {"-I$dirpfx$_"} @srcdirs) . +- " `\$(GTK_CONFIG) --cflags` \$(CFLAGS)")."\n". +- "XLIBS = `\$(GTK_CONFIG) --libs`\n". ++ " `pkg-config gtk+-2.0 --cflags` \$(CFLAGS)")."\n". ++ "XLIBS = `pkg-config gtk+-2.0 --libs`\n". + "ULIBS =#\n". + "INSTALL=install\n", + "INSTALL_PROGRAM=\$(INSTALL)\n", +@@ -1130,7 +1130,7 @@ + $objstr = &objects($p, "X.o", undef, undef); + print &splitline($prog . ": " . $objstr), "\n"; + $libstr = &objects($p, undef, undef, "-lX"); +- print &splitline("\t\$(CC) -o \$@ $objstr $libstr \$(${type}LIBS)", 69), ++ print &splitline("\t\$(CC) \$(LDFLAGS) -o \$@ $objstr $libstr \$(${type}LIBS)", 69), + "\n\n"; + } + foreach $d (&deps("X.o", undef, $dirpfx, "/")) { diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-9023.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-9023.ebuild new file mode 100644 index 000000000000..a96d209ae287 --- /dev/null +++ b/games-puzzle/sgt-puzzles/sgt-puzzles-9023.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/sgt-puzzles-9023.ebuild,v 1.1 2010/11/28 05:52:31 mr_bones_ Exp $ + +EAPI=2 +inherit eutils toolchain-funcs games +if [[ ${PV} == "99999999" ]] ; then + ESVN_REPO_URI="svn://svn.tartarus.org/sgt/puzzles" + inherit subversion + SRC_URI="" + KEYWORDS="" +else + SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-r${PV}.tar.gz" + S=${WORKDIR}/puzzles-r${PV} + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Simon Tatham's Portable Puzzle Collection" +HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" + +LICENSE="MIT" +SLOT="0" +IUSE="doc" + +RDEPEND="x11-libs/gtk+:2" +DEPEND="${RDEPEND} + dev-lang/perl + dev-util/pkgconfig + doc? ( >=app-doc/halibut-1.0 )" + +src_prepare() { + epatch "${FILESDIR}"/${P}-gentoo.patch + ./mkfiles.pl + sed -i \ + -e 's:= -O2 -Wall -Werror -ansi -pedantic -g:= $(CPPFLAGS):' \ + -e '/LDFLAGS/s:=:=$(LDFLAGS) :' \ + Makefile || die +} + +src_compile() { + emake CC="$(tc-getCC)" || die + if use doc ; then + halibut --text --html --info --pdf --ps puzzles.but + fi +} + +src_install() { + dodir "${GAMES_BINDIR}" + emake DESTDIR="${D}" gamesdir="${GAMES_BINDIR}" install || die + dodoc README HACKING + + local file name + for file in *.R ; do + [[ ${file} == "nullgame.R" ]] && continue + name=$(sed -n 's/^[a-z]*\.exe://p' "${file}") + file=${file%.R} + if [[ ${PV} -lt 99999999 ]] ; then + newicon icons/${file}-48d24.png ${PN}-${file}.png || die + make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}" "${PN}-${file}" + else + # No icons with the live version + make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}" + fi + done + + dodoc puzzles.txt puzzles.chm + if use doc ; then + dohtml *.html + doinfo puzzles.info + dodoc puzzles.pdf puzzles.ps + fi + + prepgamesdirs +} |