convert to git; also fixes bug #532604

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

diff --git a/games-puzzle/sgt-puzzles/ChangeLog b/games-puzzle/sgt-puzzles/ChangeLog
index a94316e8e189a6ad8b55948e4cbc45fda293cc2f..ad91df107b207d0de5a310a32466cd6f2feef513 100644 (file)
--- a/games-puzzle/sgt-puzzles/ChangeLog
+++ b/games-puzzle/sgt-puzzles/ChangeLog
@@ -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 <mr_bones_@gentoo.org>
+  sgt-puzzles-99999999.ebuild:
+  convert to git; also fixes bug #532604
 
 *sgt-puzzles-9861 (13 Jun 2013)
 

diff --git a/games-puzzle/sgt-puzzles/Manifest b/games-puzzle/sgt-puzzles/Manifest
index 4ff9f51b77b2bfa1eda293c7b90ba25267ea6fda..312d15707d025e9ea5d6ee6fa530c751c2f7b2c1 100644 (file)
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -4,6 +4,6 @@ DIST puzzles-r9306.tar.gz 2975070 SHA256 940d0e6c16d1c7aaf27d375356da3e73ae55607
 DIST puzzles-r9861.tar.gz 3255388 SHA256 cc08ffd96c20dfe249d6db0e97f32608e8c52da9ca00a0e8d7d67fd4a474c3a2 SHA512 fc8abf5912e7ecdf5c5166c6b8f354e5f6dc8c42d646ffeae812c3cea21496f9ff03671268453a32c3246d1c94dfaba83628bf65ebeb645b3deb208ee3045ba1 WHIRLPOOL 1f91bc25d5c8dbf531d71eb3783169477834c232810f529cf682d69a121688584af7dc51b00c380e85dfee3119f9644d2f741f4c9f9dfc2054bc72fa5dd88de5
 EBUILD sgt-puzzles-9306.ebuild 1853 SHA256 ba341883ea6452733928e154afdfdcb0de883b523ee8eb65ecdc3073ea1a1b57 SHA512 8c90fb26b94904292987283d6cbb89636af0eb2b250a7fa5579eb500264fcd6c8f53d9dd1403468a04433b61b00a7cf1cf3f03e2d3ec0c7961f20ff39c36ea77 WHIRLPOOL b03351e7bec9ae6b79d290623db8b7ef803ae3eb41c1fa0614c5b2be4fc425eeb5099f4691a0c926d9e4c432a28782225133916ea8e94a31abb9ef9ecbf79a65
 EBUILD sgt-puzzles-9861.ebuild 2112 SHA256 a39afcce88d8bfe019d4b3d95b297fd14f58012d96166979880e71c78027ad40 SHA512 5deb4b5a270044af8fd920e7abf6b5ba187590c6fd1548c45bf23a9ce14ed6cd246de48081ab19f60fcc57d9406b26778920e9fdf2568e802eb50c8fc1e6a96c WHIRLPOOL 000e22379d5686bd38db92d80c0b4d4f15c7cee5e8fafaa127e21237b57060be6ec7545a385ff95b15961f97fb4e287b5be1789fdc4d5422758e55ae96f3cc39
-EBUILD sgt-puzzles-99999999.ebuild 1924 SHA256 bd9844ba3217dc3ebccc254d8902550dc162d02af2886db3679ee2ab4dedbbd2 SHA512 e5cea540e0f338c83e3beba738582d79a4665c06b7941137100a8b582f1652d31c74868818866e0bc23b82fc3e05468cc1a9ecb65133831bb145d3a4943dde19 WHIRLPOOL 6e3d686cd341a9108240691911f4bc232d3eab1e23e2db75e1f6edb599c9f0ab461c0bc0d177e44b06414051d2a8f770fceca3e59823cf541813653907cde68e
-MISC ChangeLog 2891 SHA256 3b356d19b606d73dad7ccb8eea5dccfb3817f76c57ccd0266fab45247036b85b SHA512 a31949816e8654d47fc36794de5673d7d4bc740c320f574b817946859aa47122fb7586d5eb846040c9353a2f8edb5bd94336a8e904fe8e3fc86971f124e20150 WHIRLPOOL baed07570fcb2042ac28ad725737a2b4a6e9e25bca2c429287085ba0f277d6d1ad542ffa63a266d4079ff6cb1c28233bd6eec01776feb45e5711ac39a81568c2
+EBUILD sgt-puzzles-99999999.ebuild 2282 SHA256 29c74a67c68981b023c29c6b27b7381a7363003833152da53d97548a36438177 SHA512 837701fcb097c2a66c2047abdb3d65afca89c7da20d89c254ec1cf4cf8fbcf2a97b75b6c17ad6d940bedd508cbba0b48ea17547f3a76f68c862bd5100fd7d23e WHIRLPOOL c0ae9fc8c0aa2ac197818eeba5d7659f8f15e6483c49d308731d8266363b872eca7c31e85536a25f48dadd7188ec00fcca5497d0b90c243ec36d2b319a3d3ad6
+MISC ChangeLog 3019 SHA256 e5cfa45951eefbafde07791e845831864c37910af93b911280f6b951b813033b SHA512 364eac0f6e5f314cc1120fcc9c454659ac62f1f0de0af57968650b617aa8765f2b4efa537935ed3edf73c26cf29cdef5f952b7f31548e16a029953604f2e1468 WHIRLPOOL 225450bc37fec4671e8f47b90cdd20e0504cdbf51a249b4d6a5676465266044b6faff786c27a193ee4b6048521ac67d6c7179b62a4903da2713499fe3d01b038
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
index 7c92810b1d0ac08903188ee7f20b9083c2f652a7..5c80d79ecae251862778626c856524a2074b3147 100644 (file)
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
@@ -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 @@ DEPEND="${RDEPEND}
        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 @@ src_install() {
                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 @@ src_install() {
 
        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
+}