revbump: bump eapi, update icon cache, respect CFLAGS wrt #453150

Package-Manager: portage-2.2.0_alpha159/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 106 insertions, 19 deletions

diff --git a/games-board/spider/ChangeLog b/games-board/spider/ChangeLog
index 7a4be9d01f62..d8ad8bb662bb 100644
--- a/games-board/spider/ChangeLog
+++ b/games-board/spider/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-board/spider
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/spider/ChangeLog,v 1.6 2012/12/11 06:34:02 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/spider/ChangeLog,v 1.7 2013/01/24 00:01:58 hasufell Exp $
+
+*spider-1.2_p4-r1 (23 Jan 2013)
+
+  23 Jan 2013; Julian Ospald <hasufell@gentoo.org> spider-1.2_p4.ebuild,
+  +spider-1.2_p4-r1.ebuild:
+  fix copyright header
+  revbump: bump eapi, update icon cache, respect CFLAGS wrt #453150
 
   11 Dec 2012; Ulrich Müller <ulm@gentoo.org> spider-1.2_p4.ebuild:
   Update LICENSE, see copyright.h file.
diff --git a/games-board/spider/Manifest b/games-board/spider/Manifest
index a9d1685e31e0..2f2ff48a4a85 100644
--- a/games-board/spider/Manifest
+++ b/games-board/spider/Manifest
@@ -3,23 +3,18 @@ Hash: SHA256
 
 DIST spider_1.2-4.diff.gz 2882 SHA256 d4135ae12f39a1f8aa4286fda607e61751d4c5898d22b962e62bc2f73bc71bbd SHA512 e1e6eb4d5b14de7c32e1537877a3d26470c032bea567aa679c8a3744d62ab6b12d81bf05120679a273d98b6fd976c32d24ce9c54b720d006c51464f7ff6d5e75 WHIRLPOOL f0932d0f3abbfd93240d05b739addd49b5c0d4e0d9cec7ec65149e088494c29698e0737db4a895347722ca9ac7bb4427a3276e91e5237fdd3aacaeed8590dd25
 DIST spider_1.2.orig.tar.gz 168209 SHA256 0c5a813a967b9f5ca8c799c05b2583481a292fbcca57293055c243566a7f03b3 SHA512 a1d01f15ca37c8abdcc9f7c3dac925b1726f9b58ce51eb4096a9248abe0a55086ccdd5cc5ec358c2ee609ff089978676a3e3c669062a522ed7f1d4ea1ce33ab0 WHIRLPOOL bec06ca75c28416a5359022e24948c6c1e06e7f37e857f657e00b41a2bf69ee76f31061bec5734657e755134c9197d59b2ee78447c142c97cace8b65e74e09af
-EBUILD spider-1.2_p4.ebuild 1590 SHA256 7b1868b9287baca4a4a1e18ff3eb7bfc15ec326f4e82b44800382b796475bf26 SHA512 7338cead44d9679223546bba2b0cfaaa69ba829bcfbc5e8a99c8bdec08ecd8fb003264e2313bc86169edae086dd5ce42ec824eb36f5e7a16908298d988a69c97 WHIRLPOOL 3e30069114584980e1f7653d186371ba9e34cc75333ffb4cef1ca7fbbbcc047aae236cf559b3aeeb116bd417a7d686a6425356ab0f67b231ff5203b26932440a
-MISC ChangeLog 984 SHA256 dad617c5443b4b648baff7bf91381ab7ec68d504b05409d292c1a5b852e6a8b8 SHA512 553227619c6c3fc0466823cbcb3105cf130347bf700bc2626a61e3d94b9f22b69a36e7f962e19b3d58130cf9e3b4ca1e24d210e9edd8db2523a4387de27cfadd WHIRLPOOL cd2347b496d0152ef2fa458766433123e2200dc5495ed0f72c493c02d4aa217bb7d491ddcba0bd4e5eaeabb84e65d448e0f7afc801aa307fb4d594601410fc1a
+EBUILD spider-1.2_p4-r1.ebuild 1823 SHA256 cccf68661171d15a4654abc49ea8d0db38c4ec644dc301b112091a076716891b SHA512 772f89b21c9f0a86a971ecf36c1f4a82a9d4b8e1b26cd6233cc3fcc02a5769a8c5f7ba57cc0c06610ba1e788593888e1216e6f3de1a3fb9c0be3bfbf834e749c WHIRLPOOL 8c96c02f3bd2b240aef1a14529eea2262681218e6b7617e7a0ea4788975c8522537323374eb3c87e380ab5be78a8939df7b81354f028f492b98198b32045501a
+EBUILD spider-1.2_p4.ebuild 1595 SHA256 9553256d50e2d65b0221316e9ed17558da19f485bccc4a95e4d6b8933e7ffdc6 SHA512 bde467e5e142f7d8a21c2a428e1c0636266b89f7f39ede66642742b67455171f012b13986b641baf5ed122b0a0521030dad569cfc9d146e2014719e7e834ebda WHIRLPOOL f45a7cb0e6d462dc385e4a50d5698bb0248a1220edddba7a7373e61766b8d159964446ea8b74c659ba4e02b179f042d74d59d503e40570fb107c6223e3014105
+MISC ChangeLog 1215 SHA256 940b20edb38d39c31a20c0cc9b0a754a319f50a7887045277734201dc3bccd9a SHA512 358816de1ec3a9b683f9016f392d2a88b54904cde28baec0b3a0bddc5a8f93efeb1c5a1fc625fd00328c3369f84a70215ce77b768f6e48e295cea55ea5331fa0 WHIRLPOOL 0f317e319d8ba2616145c9c4a2a04303263cf5d6d443ddb2e87983255d459e518ba9917ef82c9c24d55a4060d338cc42dd3e483ead7ec20da00107fdba1a2921
 MISC metadata.xml 228 SHA256 07e615450b639d675daaf2d42086b77611bff168dfbaaccbbe452ecdd8349a10 SHA512 e6c185b821d0f059a5743e5d3500dc04f9199d8e3fa38f1b6da9f776790c163d24dddfff39837b103e5025350d2cb3dd19ef807990dce183079db2764d34ae2d WHIRLPOOL cd963d68f0471f4700d76d338d52ece1d6581a5e37ba7ad4f5031fc07f2b529faa8d06b5042b483a6a9f0c0970d585d6c0e84f8fe013f59c67aaf1dd4b621ac4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQxtQ8AAoJEDxpGckxwJCBUewP/jwiYufDcjYbMjbMbw1/EAdX
-PEUtCNLiQvpldvIT/3gpDJv737NNqU5X00eJKas0oy5VV/cIY+m5mOrLSMCD88Ld
-PuU8dkJqjwIFnRuHdGvOV9wQpP66LbjrEHspubznC7OAN9cRrOyr+NBJHP1uajMi
-9gyO20FG0kn0K05qSvKnW1gpAOuHCrp0Qbo1SekzWDa7PqXFd/wTdUerrAMIDITW
-MgDWUniSby8Q1cd+O50A4Azf74+f4/VNb2e7y8odhwVptz96R6ZIG9BawnocftVO
-trrkgTPgYrx/R5sXhcSvGrmYk/cAs0JugsuBvD1iyUcaJlUeEaKTPmeDvjty5utL
-Pi0y+yuJ7fUgHpAORJEllnYTEjPfyU6YKwbXiFJrDZLFivxxy2S08emHNnOn1UzX
-pu0vzuDFi/YXT8J3LxR2UYwQmuzxyOZTxss7pnFvvno0nZ1K0ncYNwhhm3jM7F9v
-ozEpi40iGHyrKDlmph3QqyeBjA7GVnQMlbKd5BFUY+/G9OHRLoGXaHa21aUYlpF4
-lcednW1u0NUAyGBzkR+Lcfcx33RIwTbg2bXLcnjZFefpwBRZKX45ERHWzxmq4T4w
-wCzRqenHGCuz6siwX403y1DqLRpCzAtaHdfEgRlkdNWNltRHowWQAR0mk2Twr/ga
-q3DdCpxJyXIGIuz33g4J
-=2Yyr
+iQEcBAEBCAAGBQJRAHn6AAoJEFpvPKfnPDWz5QUH/2yjdE8fFQgG1Se4gqZS4gS5
+Od2/dUoKMfVKhDSeYKl/gwM8zsS1utE1JXyp+D3cjaEDdkRMu5VrYRVvM4U5+iPL
+ENwSKKgnlvqqSgQcQ+SoolCHChU1dCsIajtnuVpBaK6xgjzbvYtuzFFNDjpLPB33
+OdrY9Flb3PwIw8Hnvj+tyoqB2X1B2E89A/ecsybXw/6NLwkcNeJBVHZhHeUn/A5V
+HYUdKhPupdFgfFszXqPB5xvd7zurFwzRh1IdSd/X8u6t0BZK7maQDUUmJJ7Q7LX9
+ugnGxtkYBYbHNd8ZFLHYS2eF9Pggs53tg1N0TuxtOQRQ+cgu6O/hGZc419mzFFE=
+=BBCS
 -----END PGP SIGNATURE-----
diff --git a/games-board/spider/spider-1.2_p4-r1.ebuild b/games-board/spider/spider-1.2_p4-r1.ebuild
new file mode 100644
index 000000000000..465b89b21f93
--- /dev/null
+++ b/games-board/spider/spider-1.2_p4-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/spider/spider-1.2_p4-r1.ebuild,v 1.1 2013/01/24 00:01:58 hasufell Exp $
+
+EAPI=5
+inherit eutils gnome2-utils games
+
+MY_P="${P%%_*}"
+MY_P="${MY_P/-/_}"
+DEB_V="${P##*_p}"
+
+DESCRIPTION="Spider Solitaire"
+HOMEPAGE="http://packages.debian.org/stable/games/spider"
+SRC_URI="mirror://debian/pool/main/s/spider/${MY_P}.orig.tar.gz
+	mirror://debian/pool/main/s/spider/${MY_P}-${DEB_V}.diff.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="athena"
+
+RDEPEND="x11-libs/libXext
+	athena? ( x11-libs/libXaw )
+	x11-libs/libXmu
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	x11-misc/imake
+	x11-proto/xproto"
+
+S=${WORKDIR}/${MY_P/_/-}.orig
+
+src_prepare() {
+	epatch "${WORKDIR}"/${MY_P}-${DEB_V}.diff
+	sed -i \
+		-e '/MKDIRHIER/s:/X11::' \
+		*Imakefile \
+		|| die "sed failed"
+	rm Makefile
+}
+
+src_configure() {
+	imake \
+		-DUseInstalled \
+		-DSmallCards=NO \
+		-DRoundCards \
+		$(use athena && echo "-DCompileXAW=YES" || echo "-DCompileXlibOnly=YES") \
+		-I/usr/lib/X11/config \
+		|| die "imake failed"
+	sed -i \
+		-e '/CC = /d' \
+		-e "s/CDEBUGFLAGS = .*$/CDEBUGFLAGS = ${CFLAGS}/" \
+		-e '/LDOPTIONS = /s/$/$(LDFLAGS)/' \
+		Makefile \
+		|| die "sed failed"
+}
+
+src_install() {
+	emake -j1 \
+		DESTDIR="${D}" \
+		BINDIR="${GAMES_BINDIR}" \
+		MANSUFFIX="6" \
+		MANDIR="/usr/share/man/man6" \
+		HELPDIR="/usr/share/doc/${PF}" \
+		install install.doc install.man
+
+	dodoc README* ChangeLog
+	newicon icons/Spider.png ${PN}.png
+	newicon -s 32 icons/Spider32x32.png ${PN}.png
+	make_desktop_entry spider Spider
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-board/spider/spider-1.2_p4.ebuild b/games-board/spider/spider-1.2_p4.ebuild
index 94909a9bb22f..d57b4feded92 100644
--- a/games-board/spider/spider-1.2_p4.ebuild
+++ b/games-board/spider/spider-1.2_p4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/spider/spider-1.2_p4.ebuild,v 1.6 2012/12/11 06:34:02 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/spider/spider-1.2_p4.ebuild,v 1.7 2013/01/24 00:01:58 hasufell Exp $
 
 EAPI=2
 inherit eutils games