gentoo resync : 15.11.2017

3 files changed, 117 insertions, 2 deletions

diff --git a/games-puzzle/sgt-puzzles/Manifest b/games-puzzle/sgt-puzzles/Manifest
index a8847e557792..e396f28d586c 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -3,10 +3,12 @@ AUX sgt-puzzles.directory 65 SHA256 5358d29d2429a500d05bfdc5aba23c58f635f9f45deb
 AUX sgt-puzzles.menu 556 SHA256 7576f1e82e7fbaed12d45c5f38b27c4e376827f216f558c4b117c9f152071c21 SHA512 2b3d68ae2eef33199953fe85af08c87ba91cfc8c1ea92b535af90c5f07fcbbccec124a0b9701b8cafe92786d945f2ed499e046a55d1e6da1bbb02ae5f02e5ee9 WHIRLPOOL 9523626e5c2ebf06866a9bdfeccd6a2603fb595da80030f56aa42861127a75ce074f6291bee726f4bc333ebe17aff98482d1735d9a142a320289abaf9ac6a32c
 DIST puzzles-20170314.eedea41.tar.gz 2897824 SHA256 57c156fa7de2605a4ae0f18e54ce20ef4e08b8faf32d26eccf5a7fa545940fa8 SHA512 ef7d12e0e20aef487a18b572a4464f3e23b226fae599cc22fdb34348f6c3baf3dcd21207c8fedef0ac3a6c4344b13e520767efef8830aaa2ad4b914285f8aa3c WHIRLPOOL 17b069ae171497212411ed6696fafd00108064f3a28ce38925a4fc6d9040e3d072a14920b024c329e597fe1fdedc9723089ea5c17d7df9226ac45ba612a1de70
 DIST puzzles-20170514.7bdfda8.tar.gz 2910137 SHA256 fa7e0e7d2f4bf43d4d5d91e0836ad87a133657a99f00ec5ee77504cd8bafda58 SHA512 b0acbc1cf3e2986c6c3a58a126ff4e9e8751e93ee9a4771e2fd8af6c98c01bbbe01db8ccc526fdbac1ee8bf9a4391c9b90d66e19458fdc53858a6a3724c02a4b WHIRLPOOL bae1cd85b3d4973db5e8610cb9b023a39fe5ee11386723e44d4ef7464615f9373d5b10f2d8cf325257709b3184ee40453b0262e22e427a8353f0e9c1c74adc51
+DIST puzzles-20171029.69773d8.tar.gz 2923623 SHA256 c075f5b1063a8881ad5efb393595912fdf9f7f016b5fce6082d14b0190522f54 SHA512 ca9885bcadd0bb979167f2f0b6129a17aeab6d7fd31eeabc9d29ab526a5a137b03f1f4aea7a268109c5aee1a522d514bf522ad25673705f50addd685401d7fb8 WHIRLPOOL 4d214667bcfef5f43c62efbe8787e3ce879a780b9886ea3fd7920202d2ee0bbd98622463ffd0d8392248a256198e8f67f674aacacebdec83eae34004f2f688bb
 DIST sgt-puzzles-icons-20160315.tar.xz 715536 SHA256 9ddc1b6d02b3c3358a9bc6b17c7070650f794cf5f650f25b2ac7e5def6674447 SHA512 2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57 WHIRLPOOL 17bdadc9519320bc88af27f2db7a9c243f04d80e524db51ad9398831185e2c66f2430006c324fa7d5b70ce156cb9df93d9405216053b32101b5f56035a60f6ac
 EBUILD sgt-puzzles-20170314.ebuild 2429 SHA256 2164350c2ec01e3d857f943edaddfd8d5ecc9857befb5b83cd2357e538fe488b SHA512 1109541b041b76adb5ced751bbce4e47e1f331a5929d768a8db682cadc8d32d4a2af30afe542b19c2e36e72bdc64483f3829d210d1760977728ef1ba378461cc WHIRLPOOL 741b5bc6535cc26f4b0d556ccd05f625eb9ca7093418a2c8c4d4402dfef77be15ed0dcdfde3f238d989b364506e104b7a82107eb8048fc2ccb1be8ffdf0dc209
 EBUILD sgt-puzzles-20170514.ebuild 2431 SHA256 f9e4c4215d7debb60b58e73ea54b6489c1f17f676bf8e9fbfcc0f9645c0aa94d SHA512 aa5ff7bbb5865ffe9fef85bc08d20f81fc15b501464043b97e7e5fd3157f2faf0d3f0911f80c763f2007aec21d335a5fbc87140ccb00634152c2f88f22e1345d WHIRLPOOL 4928ee21f72596e8bfb24e63964d897c226a58224af5a205364d3b197fdb394608df81e0b152299105240b582c15d33ee09bf6ff43516997fe0aaf5e1f2ce301
-EBUILD sgt-puzzles-99999999.ebuild 2431 SHA256 f9e4c4215d7debb60b58e73ea54b6489c1f17f676bf8e9fbfcc0f9645c0aa94d SHA512 aa5ff7bbb5865ffe9fef85bc08d20f81fc15b501464043b97e7e5fd3157f2faf0d3f0911f80c763f2007aec21d335a5fbc87140ccb00634152c2f88f22e1345d WHIRLPOOL 4928ee21f72596e8bfb24e63964d897c226a58224af5a205364d3b197fdb394608df81e0b152299105240b582c15d33ee09bf6ff43516997fe0aaf5e1f2ce301
+EBUILD sgt-puzzles-20171029.ebuild 2431 SHA256 e40686f060df96c4a19e27fcaa2bf98468404411420440cae64cb67eb58fb58f SHA512 eb4a16ae029e5b738735ad1286fed227f32eec32d99fd2cc4ae728798d48bd329d635004d5a2733280f761c012d46ca70072e2a0dc01b6b742650510a306c2c2 WHIRLPOOL 57cbb0d90b2b28e6f744f5302cae7b4be8612c97576cfe0f8bca268597214ff9cff9e88c89849b00531ea45d1873d65f20f1af62088745375d388a06136558fb
+EBUILD sgt-puzzles-99999999.ebuild 2431 SHA256 e40686f060df96c4a19e27fcaa2bf98468404411420440cae64cb67eb58fb58f SHA512 eb4a16ae029e5b738735ad1286fed227f32eec32d99fd2cc4ae728798d48bd329d635004d5a2733280f761c012d46ca70072e2a0dc01b6b742650510a306c2c2 WHIRLPOOL 57cbb0d90b2b28e6f744f5302cae7b4be8612c97576cfe0f8bca268597214ff9cff9e88c89849b00531ea45d1873d65f20f1af62088745375d388a06136558fb
 MISC ChangeLog 4138 SHA256 b7c3aa81c56a5013643c275b9a81d489f6aa1d385bf789ddfde45452566b7940 SHA512 2549275999e7a70e6735af3df6fadc508e31e3d855faf1256373c93f2876456c8fdd6df4f8434b160ff8a28f3b80f46f27f94a325d6c1744575419d78ff22461 WHIRLPOOL 073bbb00e9b1415161e0f0483c92094a7c4ea1eda222ad2aedb2bb08193b1f67919ef32e9ed4ce2575326dfea57f317828f2a3a986228e9f30eade0644cc98e8
 MISC ChangeLog-2015 3475 SHA256 00af97a81cc68c337dbd1e2c31e8a7e8c1ba0f498d771f3fa7a5b92fccdadede SHA512 7b3340e5b967f8c7182d6c6236fb31685597b800a497192eab0a00351621f50ecc2937e5629d6c2deed907d2b40d932c430616d650d1b2ceb91ff1f91e18fa7c WHIRLPOOL 2643ca84df68c6488b1144b46c9a38ba5e6160a214517bedfebe82e7bb74f591c7fa384461e81c1e2178d7946c0129c3942b634da73db0daa1849342063ee714
 MISC metadata.xml 509 SHA256 ea30284d04d8aa721cd895a05379d54af0f7c6dd2029cc6443945d03c5648520 SHA512 bf7a3e8f5e458b64950e264361f2aa10bb12abf9b00d4424f3e23659f3fa5f33171b9f60e2f776a7226a8ca2aec61895e446eb893d63d6347a25ef7e47faf931 WHIRLPOOL 3332cf4e852f50b8ca4b2a03c4a0396bfdfd7ccf01eea88ba057042b9641cef4ffeb555f384e2c62c23e1b6b2d2a21049092e7b503823a617037c1c3b2b16be1
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20171029.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-20171029.ebuild
new file mode 100644
index 000000000000..cc3a64811f1f
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20171029.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils toolchain-funcs autotools
+
+if [[ ${PV} == "99999999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.tartarus.org/simon/puzzles.git"
+	GENTOO_ICONS="20160315"
+	SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz"
+	KEYWORDS=""
+else
+	MAGIC=69773d8
+	SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
+	S=${WORKDIR}/puzzles-${PV}.${MAGIC}
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+doc gtk3"
+
+COMMON_DEPEND="
+	!gtk3? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )"
+
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xdg-utils" # Used by builtin help patch
+
+DEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	virtual/pkgconfig
+	doc? ( >=app-doc/halibut-1.2 )"
+
+PATCHES=( "${FILESDIR}/${PN}-20161207-builtin-help.patch" )
+
+src_unpack() {
+	default
+	if [[ ${PV} == "99999999" ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's/-O2 -Wall -Werror -ansi -pedantic -g//' \
+		-e "s/libstr =/libstr = '\$(LDFLAGS) ' ./" \
+		mkfiles.pl || die
+	./mkfiles.pl || die
+	eautoreconf
+
+	# Import icons from latest Gentoo tarball for live
+	if [[ ${PV} == "99999999" ]]; then
+		cp -R ../${PN}-icons/icons . || die
+	fi
+}
+
+src_configure() {
+	econf \
+		--program-prefix="${PN}_" \
+		--with-gtk=$(usex gtk3 3 2)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+	if use doc ; then
+		halibut --text --html --info --pdf --ps puzzles.but || die
+	fi
+}
+
+src_install() {
+	default
+
+	local file name
+	for file in *.R ; do
+		[[ ${file} == "nullgame.R" ]] && continue
+		name=$(awk -F: '/exe:/ { print $3 }' "${file}")
+		file=${file%.R}
+		newicon -s 48 icons/${file}-48d24.png ${PN}_${file}.png
+		make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" "Game;LogicGame;X-${PN};"
+	done
+
+	if use doc ; then
+		DOCS=( puzzles.{pdf,ps,txt} )
+		HTML_DOCS=( *.html )
+		einstalldocs
+		doinfo puzzles.info{,-1,-2,-3}
+	fi
+
+	insinto /etc/xdg/menus/applications-merged
+	doins "${FILESDIR}/${PN}.menu"
+	insinto /usr/share/desktop-directories
+	doins "${FILESDIR}/${PN}.directory"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
index 483e2dc3387b..cc3a64811f1f 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz"
 	KEYWORDS=""
 else
-	MAGIC=7bdfda8
+	MAGIC=69773d8
 	SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
 	S=${WORKDIR}/puzzles-${PV}.${MAGIC}
 	KEYWORDS="~amd64 ~x86"