mr_bones_ 15/04/20 03:56:17 Modified: sgt-puzzles-99999999.ebuild ChangeLog Log: convert to git; also fixes bug #532604 (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.6 games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild?r1=1.5&r2=1.6 Index: sgt-puzzles-99999999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sgt-puzzles-99999999.ebuild 4 May 2012 04:45:28 -0000 1.5 +++ sgt-puzzles-99999999.ebuild 20 Apr 2015 03:56:17 -0000 1.6 @@ -1,12 +1,12 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild,v 1.5 2012/05/04 04:45:28 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild,v 1.6 2015/04/20 03:56:17 mr_bones_ Exp $ -EAPI=2 -inherit eutils toolchain-funcs games +EAPI=5 +inherit eutils gnome2-utils toolchain-funcs games if [[ ${PV} == "99999999" ]] ; then - ESVN_REPO_URI="svn://svn.tartarus.org/sgt/puzzles" - inherit subversion + EGIT_REPO_URI="git://git.tartarus.org/simon/puzzles.git" + inherit autotools git-r3 SRC_URI="" KEYWORDS="" else @@ -29,28 +29,31 @@ doc? ( >=app-doc/halibut-1.0 )" src_prepare() { - sed -i \ - -e 's/-O2 -Wall -Werror -ansi -pedantic -g//' \ - -e "s/libstr =/libstr = '\$(LDFLAGS) ' ./" \ - mkfiles.pl \ - || die - ./mkfiles.pl - sed -i \ - -e '1iPKG_CONFIG ?= pkg-config' \ - -e '/^GTK_CONFIG/s:=.*:= $(PKG_CONFIG) gtk+-2.0:' \ - Makefile || die + if [[ ${PV} == "99999999" ]] ; then + sed -i \ + -e 's/-O2 -Wall -Werror -ansi -pedantic -g//' \ + -e "s/libstr =/libstr = '\$(LDFLAGS) ' ./" \ + mkfiles.pl || die + ./mkfiles.pl || die + eautoreconf + else + sed -i \ + -e 's:= -O2 -Wall -Werror -ansi -pedantic -g:= $(CPPFLAGS):' \ + -e '/LDFLAGS/s:=:=$(LDFLAGS) :' \ + Makefile || die + fi } src_compile() { - emake CC="$(tc-getCC)" || die + emake CC="$(tc-getCC)" if use doc ; then - halibut --text --html --info --pdf --ps puzzles.but + halibut --text --html --info --pdf --ps puzzles.but || die fi } src_install() { dodir "${GAMES_BINDIR}" - emake DESTDIR="${D}" gamesdir="${GAMES_BINDIR}" install || die + emake DESTDIR="${D}" gamesdir="${GAMES_BINDIR}" install dodoc README local file name @@ -59,7 +62,7 @@ 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 + newicon -s 48 icons/${file}-48d24.png ${PN}-${file}.png make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}" "${PN}-${file}" else # No icons with the live version @@ -75,3 +78,17 @@ prepgamesdirs } + +pkg_preinst() { + games_pkg_preinst + [[ ${PV} -lt 99999999 ]] && gnome2_icon_savelist +} + +pkg_postinst() { + games_pkg_postinst + [[ ${PV} -lt 99999999 ]] && gnome2_icon_cache_update +} + +pkg_postrm() { + [[ ${PV} -lt 99999999 ]] && gnome2_icon_cache_update +} 1.17 games-puzzle/sgt-puzzles/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/sgt-puzzles/ChangeLog?rev=1.17&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/sgt-puzzles/ChangeLog?rev=1.17&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/sgt-puzzles/ChangeLog?r1=1.16&r2=1.17 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/ChangeLog,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ChangeLog 13 Jun 2013 04:12:11 -0000 1.16 +++ ChangeLog 20 Apr 2015 03:56:17 -0000 1.17 @@ -1,6 +1,10 @@ # ChangeLog for games-puzzle/sgt-puzzles -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/ChangeLog,v 1.16 2013/06/13 04:12:11 mr_bones_ Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/ChangeLog,v 1.17 2015/04/20 03:56:17 mr_bones_ Exp $ + + 20 Apr 2015; Michael Sterrett <[email protected]> + sgt-puzzles-99999999.ebuild: + convert to git; also fixes bug #532604 *sgt-puzzles-9861 (13 Jun 2013)
