[gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/, net-misc/putty/, sys-apps/agedu/, app-doc/halibut/, ...

2024-01-12 Thread Michał Górny 
commit: e7c994d2c19272adb954609a0e933e630c5a6791
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 11 16:06:08 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jan 12 14:36:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7c994d2

Move {app-doc → app-text}/halibut

Per the category metadata, app-doc/ is reserved for documentation
*files* and not software.  Move it to app-text/ where it seems a better
fit.

Signed-off-by: Michał Górny  gentoo.org>

 {app-doc => app-text}/halibut/Manifest   | 0
 {app-doc => app-text}/halibut/halibut-1.3.ebuild | 2 +-
 {app-doc => app-text}/halibut/metadata.xml   | 0
 games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild | 4 ++--
 net-misc/putty/putty-0.80.ebuild | 4 ++--
 profiles/arch/alpha/package.use.mask | 2 +-
 profiles/updates/1Q-2024 | 1 +
 sys-apps/agedu/agedu-20200617.ebuild | 4 ++--
 sys-apps/agedu/agedu-20200705.ebuild | 4 ++--
 sys-apps/agedu/agedu-20211129.ebuild | 4 ++--
 10 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app-doc/halibut/Manifest b/app-text/halibut/Manifest
similarity index 100%
rename from app-doc/halibut/Manifest
rename to app-text/halibut/Manifest

diff --git a/app-doc/halibut/halibut-1.3.ebuild 
b/app-text/halibut/halibut-1.3.ebuild
similarity index 91%
rename from app-doc/halibut/halibut-1.3.ebuild
rename to app-text/halibut/halibut-1.3.ebuild
index 8cbdd5b43cbe..5370336f4d85 100644
--- a/app-doc/halibut/halibut-1.3.ebuild
+++ b/app-text/halibut/halibut-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

diff --git a/app-doc/halibut/metadata.xml b/app-text/halibut/metadata.xml
similarity index 100%
rename from app-doc/halibut/metadata.xml
rename to app-text/halibut/metadata.xml

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild
index 902b9c928920..39e32f02b666 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,7 @@ DEPEND="${COMMON_DEPEND}"
 BDEPEND="
dev-lang/perl
virtual/pkgconfig
-   doc? ( >=app-doc/halibut-1.2 )"
+   doc? ( >=app-text/halibut-1.2 )"
 
 PATCHES=( "${FILESDIR}/${PN}-20161207-builtin-help.patch" )
 

diff --git a/net-misc/putty/putty-0.80.ebuild b/net-misc/putty/putty-0.80.ebuild
index fe26145e4df8..fdd92be3c643 100644
--- a/net-misc/putty/putty-0.80.ebuild
+++ b/net-misc/putty/putty-0.80.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -37,7 +37,7 @@ DEPEND="
 BDEPEND="
dev-lang/perl
virtual/pkgconfig
-   doc? ( app-doc/halibut )
+   doc? ( app-text/halibut )
 "
 
 src_unpack() {

diff --git a/profiles/arch/alpha/package.use.mask 
b/profiles/arch/alpha/package.use.mask
index 44093e533891..7dff65e5cba2 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -95,7 +95,7 @@ net-misc/openvswitch unwind
 net-misc/openntpd constraints
 
 # Matthew Smith  (2022-07-10)
-# Needs unkeyworded app-doc/halibut
+# Needs unkeyworded app-text/halibut
 >=net-misc/putty-0.77 doc
 
 # Sam James  (2022-04-29)

diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024
index e6b6f40f2d7e..0984b6fb6a27 100644
--- a/profiles/updates/1Q-2024
+++ b/profiles/updates/1Q-2024
@@ -2,3 +2,4 @@ move dev-python/pysol_cards dev-python/pysol-cards
 move sys-kernel/installkernel-gentoo sys-kernel/installkernel
 move app-doc/NaturalDocs app-text/NaturalDocs
 move app-doc/doxygen app-text/doxygen
+move app-doc/halibut app-text/halibut

diff --git a/sys-apps/agedu/agedu-20200617.ebuild 
b/sys-apps/agedu/agedu-20200617.ebuild
index 6e773cca11b6..1521d19f0309 100644
--- a/sys-apps/agedu/agedu-20200617.ebuild
+++ b/sys-apps/agedu/agedu-20200617.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc ipv6"
 
-DEPEND="doc? ( app-doc/halibut )"
+DEPEND="doc? ( app-text/halibut )"
 
 PATCHES=(
"${FILESDIR}/${PN}-r9671-fix-automagic.patch"

diff --git a/sys-apps/agedu/agedu-20200705.ebuild 
b/sys-apps/agedu/agedu-20200705.ebuild
index be1c1f08bf7d..e044de694b53 100644
--- a/sys-apps/agedu/agedu-20200705.ebuild
+++ b/sys-apps/agedu/agedu-20200705.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/

2021-05-30 Thread Andreas Sturmlechner 
commit: e1fd6e3ae5cc11bb5c4cd7354b185200eed8f3f9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May 15 15:24:36 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 30 21:09:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1fd6e3a

games-puzzle/sgt-puzzles: Drop defunct  version

Upstream switched to cmake, patch broken, needs complete rework.

Closes: https://bugs.gentoo.org/769167
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 games-puzzle/sgt-puzzles/Manifest  |   1 -
 games-puzzle/sgt-puzzles/metadata.xml  |   3 -
 .../sgt-puzzles/sgt-puzzles-.ebuild| 115 -
 3 files changed, 119 deletions(-)

diff --git a/games-puzzle/sgt-puzzles/Manifest 
b/games-puzzle/sgt-puzzles/Manifest
index f6eeba83f95..94246fc1359 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -1,2 +1 @@
 DIST puzzles-20190415.e2135d5.tar.gz 3286744 BLAKE2B 
6b19cde3f95b5375bde74923a5f8e3deb9abb7d4d737ad5f2d18aa7895b973a9ca1ed4a495cf80da8390ed7fb63f1eb973c8053d52145e5752c56e38d3ac19d7
 SHA512 
5f38c96cff4e745a1c1615762c0e5f3f3dd056ff7dbf0f80a5953e658ae1460503c6394fe29301f5682485d6a6121869853a270dc60327821a3059ca6d971fa1
-DIST sgt-puzzles-icons-20160315.tar.xz 715536 BLAKE2B 
c50b3a6a0d0f8a052215dd9fba7c3eca5822bc7f866a825ad5e92391bb1867d141793877bc7c4545cc6da674bf273752612f7d3578a6a05b22cc2552ea798ce6
 SHA512 
2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57

diff --git a/games-puzzle/sgt-puzzles/metadata.xml 
b/games-puzzle/sgt-puzzles/metadata.xml
index 697024d76f6..fa736384b59 100644
--- a/games-puzzle/sgt-puzzles/metadata.xml
+++ b/games-puzzle/sgt-puzzles/metadata.xml
@@ -9,7 +9,4 @@
np-hard...@gentoo.org
Adam Feldman

-   
-   Use x11-libs/gtk+:3 instead of 
x11-libs/gtk+:2
-   
 

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
deleted file mode 100644
index 2988d396d97..000
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils toolchain-funcs autotools
-
-if [[ ${PV} == "" ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://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;
-else
-   MAGIC=e2135d5
-   
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} == "" ]]; then
-   git-r3_src_unpack
-   fi
-}
-
-src_prepare() {
-   default
-
-   sed -i \
-   -e 's|-Werror||g' \
-   configure.ac || die
-   sed -i \
-   -e 's/-O2 -Wall .* -g/-Wall/' \
-   -e "s/libstr =/libstr = '\$(LDFLAGS) ' ./" \
-   mkfiles.pl || die
-   ./mkfiles.pl || die
-   eautoreconf
-
-   # Import icons from latest Gentoo tarball for live
-   if [[ ${PV} == "" ]]; 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
-

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/

2021-05-30 Thread Andreas Sturmlechner 
commit: 128d253494c94840403eb5688f501f5a090e2989
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May 15 15:02:45 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 30 21:07:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=128d2534

games-puzzle/sgt-puzzles: EAPI-7 bump, drop IUSE=gtk3, fix menu entry

Use desktop.eclass, xdg-utils.eclass

Thanks-to: Simon  gmx.de>
Bug: https://bugs.gentoo.org/656490
Bug: https://bugs.gentoo.org/769167
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../sgt-puzzles/sgt-puzzles-20190415.ebuild| 29 ++
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild
index 2988d396d97..902b9c92892 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils gnome2-utils toolchain-funcs autotools
+inherit autotools desktop toolchain-funcs xdg-utils
 
 if [[ ${PV} == "" ]] ; then
inherit git-r3
@@ -22,16 +22,17 @@ 
HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/;
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+doc gtk3"
+IUSE="+doc"
 
 COMMON_DEPEND="
-   !gtk3? ( x11-libs/gtk+:2 )
-   gtk3? ( x11-libs/gtk+:3 )"
+   x11-libs/gtk+:3"
 
 RDEPEND="${COMMON_DEPEND}
x11-misc/xdg-utils" # Used by builtin help patch
 
-DEPEND="${COMMON_DEPEND}
+DEPEND="${COMMON_DEPEND}"
+
+BDEPEND="
dev-lang/perl
virtual/pkgconfig
doc? ( >=app-doc/halibut-1.2 )"
@@ -67,7 +68,7 @@ src_prepare() {
 src_configure() {
econf \
--program-prefix="${PN}_" \
-   --with-gtk=$(usex gtk3 3 2)
+   --with-gtk=3
 }
 
 src_compile() {
@@ -86,12 +87,12 @@ src_install() {
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};"
+   make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" 
"LogicGame;X-${PN};"
done
 
if use doc ; then
-   DOCS=( puzzles.{pdf,ps,txt} )
-   HTML_DOCS=( *.html )
+   local DOCS=( puzzles.{pdf,ps,txt} )
+   local HTML_DOCS=( *.html )
einstalldocs
doinfo puzzles.info{,-1,-2,-3}
fi
@@ -102,14 +103,10 @@ src_install() {
doins "${FILESDIR}/${PN}.directory"
 }
 
-pkg_preinst() {
-   gnome2_icon_savelist
-}
-
 pkg_postinst() {
-   gnome2_icon_cache_update
+   xdg_icon_cache_update
 }
 
 pkg_postrm() {
-   gnome2_icon_cache_update
+   xdg_icon_cache_update
 }

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/

2019-05-06 Thread Göktürk Yüksek 
commit: a8e39709abecaf02d305b1ace1f460c3b1f02c9d
Author: NP-Hardass  gentoo  org>
AuthorDate: Mon May  6 17:42:17 2019 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Mon May  6 19:23:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8e39709

games-puzzle/sgt-puzzles: bump to 20190415

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Göktürk Yüksek  gentoo.org>

 games-puzzle/sgt-puzzles/Manifest | 1 +
 .../{sgt-puzzles-.ebuild => sgt-puzzles-20190415.ebuild}  | 4 ++--
 games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild  | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/games-puzzle/sgt-puzzles/Manifest 
b/games-puzzle/sgt-puzzles/Manifest
index ba22b7f3857..032390917ee 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -1,2 +1,3 @@
 DIST puzzles-20171029.69773d8.tar.gz 2923623 BLAKE2B 
2e97005aa5ea7e95b4f312067d406fd37f5f89638b335c5eee748f4d8c2977f663cde91ea29d57ffb1cb3eb5264cad36a46106dc8f14ddedcb0dc5f4b3e4c1f6
 SHA512 
ca9885bcadd0bb979167f2f0b6129a17aeab6d7fd31eeabc9d29ab526a5a137b03f1f4aea7a268109c5aee1a522d514bf522ad25673705f50addd685401d7fb8
+DIST puzzles-20190415.e2135d5.tar.gz 3286744 BLAKE2B 
6b19cde3f95b5375bde74923a5f8e3deb9abb7d4d737ad5f2d18aa7895b973a9ca1ed4a495cf80da8390ed7fb63f1eb973c8053d52145e5752c56e38d3ac19d7
 SHA512 
5f38c96cff4e745a1c1615762c0e5f3f3dd056ff7dbf0f80a5953e658ae1460503c6394fe29301f5682485d6a6121869853a270dc60327821a3059ca6d971fa1
 DIST sgt-puzzles-icons-20160315.tar.xz 715536 BLAKE2B 
c50b3a6a0d0f8a052215dd9fba7c3eca5822bc7f866a825ad5e92391bb1867d141793877bc7c4545cc6da674bf273752612f7d3578a6a05b22cc2552ea798ce6
 SHA512 
2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild
similarity index 97%
copy from games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
copy to games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild
index 7eaeac646bc..687d7238d44 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]] ; then

SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz;
KEYWORDS=""
 else
-   MAGIC=69773d8
+   MAGIC=e2135d5

SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz;
S=${WORKDIR}/puzzles-${PV}.${MAGIC}
KEYWORDS="~amd64 ~x86"

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
index 7eaeac646bc..687d7238d44 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]] ; then

SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz;
KEYWORDS=""
 else
-   MAGIC=69773d8
+   MAGIC=e2135d5

SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz;
S=${WORKDIR}/puzzles-${PV}.${MAGIC}
KEYWORDS="~amd64 ~x86"

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/

2019-05-06 Thread Göktürk Yüksek 
commit: 038fab56898757c249825d5ed14941a04dd12316
Author: NP-Hardass  gentoo  org>
AuthorDate: Mon May  6 17:42:18 2019 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Mon May  6 19:23:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=038fab56

games-puzzle/sgt-puzzles: Drop old

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Göktürk Yüksek  gentoo.org>

 games-puzzle/sgt-puzzles/Manifest  |   1 -
 .../sgt-puzzles/sgt-puzzles-20171029.ebuild| 116 -
 2 files changed, 117 deletions(-)

diff --git a/games-puzzle/sgt-puzzles/Manifest 
b/games-puzzle/sgt-puzzles/Manifest
index 032390917ee..f6eeba83f95 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -1,3 +1,2 @@
-DIST puzzles-20171029.69773d8.tar.gz 2923623 BLAKE2B 
2e97005aa5ea7e95b4f312067d406fd37f5f89638b335c5eee748f4d8c2977f663cde91ea29d57ffb1cb3eb5264cad36a46106dc8f14ddedcb0dc5f4b3e4c1f6
 SHA512 
ca9885bcadd0bb979167f2f0b6129a17aeab6d7fd31eeabc9d29ab526a5a137b03f1f4aea7a268109c5aee1a522d514bf522ad25673705f50addd685401d7fb8
 DIST puzzles-20190415.e2135d5.tar.gz 3286744 BLAKE2B 
6b19cde3f95b5375bde74923a5f8e3deb9abb7d4d737ad5f2d18aa7895b973a9ca1ed4a495cf80da8390ed7fb63f1eb973c8053d52145e5752c56e38d3ac19d7
 SHA512 
5f38c96cff4e745a1c1615762c0e5f3f3dd056ff7dbf0f80a5953e658ae1460503c6394fe29301f5682485d6a6121869853a270dc60327821a3059ca6d971fa1
 DIST sgt-puzzles-icons-20160315.tar.xz 715536 BLAKE2B 
c50b3a6a0d0f8a052215dd9fba7c3eca5822bc7f866a825ad5e92391bb1867d141793877bc7c4545cc6da674bf273752612f7d3578a6a05b22cc2552ea798ce6
 SHA512 
2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20171029.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-20171029.ebuild
deleted file mode 100644
index cfc0b290bca..000
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20171029.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils toolchain-funcs autotools
-
-if [[ ${PV} == "" ]] ; 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} == "" ]]; then
-   git-r3_src_unpack
-   fi
-}
-
-src_prepare() {
-   default
-
-   sed -i \
-   -e 's|-Werror||g' \
-   configure.ac || die
-   sed -i \
-   -e 's/-O2 -Wall .* -g/-Wall/' \
-   -e "s/libstr =/libstr = '\$(LDFLAGS) ' ./" \
-   mkfiles.pl || die
-   ./mkfiles.pl || die
-   eautoreconf
-
-   # Import icons from latest Gentoo tarball for live
-   if [[ ${PV} == "" ]]; 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"
-}
-

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/

2018-04-28 Thread Jeroen Roovers 
commit: a73467028e738683a1a6c9255e62bc4c7c939ecc
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Apr 28 10:53:02 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Apr 28 10:53:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7346702

games-puzzle/sgt-puzzles: Use HTTPS.

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
index cfc0b290bca..7eaeac646bc 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
@@ -7,7 +7,7 @@ inherit eutils gnome2-utils toolchain-funcs autotools
 
 if [[ ${PV} == "" ]] ; then
inherit git-r3
-   EGIT_REPO_URI="git://git.tartarus.org/simon/puzzles.git"
+   EGIT_REPO_URI="https://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=""

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/

2018-04-28 Thread Jeroen Roovers 
commit: f7888cd11398109bc79e872d86379a578d0f7898
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Apr 28 10:29:20 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Apr 28 10:29:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7888cd1

games-puzzle/sgt-puzzles: Drop -Werror (bug #654202).

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 games-puzzle/sgt-puzzles/sgt-puzzles-20171029.ebuild | 7 +--
 games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild | 7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20171029.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-20171029.ebuild
index cc3a64811f1..cfc0b290bca 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20171029.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20171029.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -50,7 +50,10 @@ src_prepare() {
default
 
sed -i \
-   -e 's/-O2 -Wall -Werror -ansi -pedantic -g//' \
+   -e 's|-Werror||g' \
+   configure.ac || die
+   sed -i \
+   -e 's/-O2 -Wall .* -g/-Wall/' \
-e "s/libstr =/libstr = '\$(LDFLAGS) ' ./" \
mkfiles.pl || die
./mkfiles.pl || die

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
index cc3a64811f1..cfc0b290bca 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -50,7 +50,10 @@ src_prepare() {
default
 
sed -i \
-   -e 's/-O2 -Wall -Werror -ansi -pedantic -g//' \
+   -e 's|-Werror||g' \
+   configure.ac || die
+   sed -i \
+   -e 's/-O2 -Wall .* -g/-Wall/' \
-e "s/libstr =/libstr = '\$(LDFLAGS) ' ./" \
mkfiles.pl || die
./mkfiles.pl || die

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/

2018-02-11 Thread Michał Górny 
commit: a54aa1c54b1db645fd3fd301e7a740b23e394969
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Feb 11 10:47:14 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb 11 10:52:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a54aa1c5

games-puzzle/sgt-puzzles: Remove useless maintainer 

Remove useless/redundant maintainer . It does not benefit
bug wrangling, and only wastes developer's time on reading it. Few tips:

- assignee/CC is implied by ordering, there is no reason to repeat it,
- we know that maintainer is maintainer (la la la la la),
- most of adjectives for maintainer are of no value and/or are obvious.

 games-puzzle/sgt-puzzles/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/games-puzzle/sgt-puzzles/metadata.xml 
b/games-puzzle/sgt-puzzles/metadata.xml
index a434a63e3f4..744f27f1fda 100644
--- a/games-puzzle/sgt-puzzles/metadata.xml
+++ b/games-puzzle/sgt-puzzles/metadata.xml
@@ -8,7 +8,6 @@

np-hard...@gentoo.org
NP-Hardass
-   Co-maintainer; CC on all bugs


Use x11-libs/gtk+:3 instead of 
x11-libs/gtk+:2

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/

2017-11-12 Thread NP Hardass 
commit: f31affe85190419c88471a370865995b5aa3eb6c
Author: NP-Hardass  gentoo  org>
AuthorDate: Sun Nov 12 16:18:55 2017 +
Commit: NP Hardass  gentoo  org>
CommitDate: Sun Nov 12 16:19:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f31affe8

games-puzzle/sgt-puzzles: Bump to 20171029

Bug: https://bugs.gentoo.org/637120
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 games-puzzle/sgt-puzzles/Manifest   | 1 +
 .../{sgt-puzzles-.ebuild => sgt-puzzles-20171029.ebuild}| 2 +-
 games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild| 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/games-puzzle/sgt-puzzles/Manifest 
b/games-puzzle/sgt-puzzles/Manifest
index 79cac0464ec..a1412e4a9f0 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -1,3 +1,4 @@
 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

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-20171029.ebuild
similarity index 99%
copy from games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
copy to games-puzzle/sgt-puzzles/sgt-puzzles-20171029.ebuild
index 483e2dc3387..cc3a64811f1 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20171029.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]] ; 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"

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
index 483e2dc3387..cc3a64811f1 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]] ; 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"

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/

2017-05-27 Thread NP Hardass 
commit: b3af5a758352d6173062e6f6b6d870a50481832e
Author: NP-Hardass  gentoo  org>
AuthorDate: Sat May 27 10:45:00 2017 +
Commit: NP Hardass  gentoo  org>
CommitDate: Sat May 27 10:50:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3af5a75

games-puzzle/sgt-puzzles: Switch to https

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild | 4 ++--
 games-puzzle/sgt-puzzles/sgt-puzzles-20170506.ebuild | 4 ++--
 games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild
index ec67b9f3b61..ccbdc036d62 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild
@@ -13,13 +13,13 @@ if [[ ${PV} == "" ]] ; then
KEYWORDS=""
 else
MAGIC=eedea41
-   
SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz;
+   
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="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/;
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/;
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20170506.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-20170506.ebuild
index cf3b22e1784..ce233796c43 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20170506.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20170506.ebuild
@@ -13,13 +13,13 @@ if [[ ${PV} == "" ]] ; then
KEYWORDS=""
 else
MAGIC=23a5372
-   
SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz;
+   
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="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/;
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/;
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
index cf3b22e1784..ce233796c43 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
@@ -13,13 +13,13 @@ if [[ ${PV} == "" ]] ; then
KEYWORDS=""
 else
MAGIC=23a5372
-   
SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz;
+   
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="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/;
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/;
 
 LICENSE="MIT"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/

2017-05-27 Thread NP Hardass 
commit: bdcb84028c7948590b4c9c4062c47ac73d9d8c71
Author: NP-Hardass  gentoo  org>
AuthorDate: Sat May 27 10:50:37 2017 +
Commit: NP Hardass  gentoo  org>
CommitDate: Sat May 27 10:50:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdcb8402

games-puzzle/sgt-puzzles: Bump to 20170514

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 games-puzzle/sgt-puzzles/Manifest | 2 +-
 .../{sgt-puzzles-20170506.ebuild => sgt-puzzles-20170514.ebuild}  | 4 ++--
 games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/games-puzzle/sgt-puzzles/Manifest 
b/games-puzzle/sgt-puzzles/Manifest
index 3603f1bc82e..79cac0464ec 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -1,3 +1,3 @@
 DIST puzzles-20170314.eedea41.tar.gz 2897824 SHA256 
57c156fa7de2605a4ae0f18e54ce20ef4e08b8faf32d26eccf5a7fa545940fa8 SHA512 
ef7d12e0e20aef487a18b572a4464f3e23b226fae599cc22fdb34348f6c3baf3dcd21207c8fedef0ac3a6c4344b13e520767efef8830aaa2ad4b914285f8aa3c
 WHIRLPOOL 
17b069ae171497212411ed6696fafd00108064f3a28ce38925a4fc6d9040e3d072a14920b024c329e597fe1fdedc9723089ea5c17d7df9226ac45ba612a1de70
-DIST puzzles-20170506.23a5372.tar.gz 2895770 SHA256 
9a5167f782100b15bf0da969c8b5b6c6f343c9c2b3417615ffc640cc09b4aee9 SHA512 
a807e9a8fb5ddbfc564f60da63886a6ce068f59077fbc3312bcf928a432b754d36db8878ee8aa8cabff7f12efddf51fb1e60f927b8bfc86cd5ebc16c367f64b5
 WHIRLPOOL 
1852267e731a21c60bca9c8d1506a21839ed65e83266d400f592106af8ff79d4a8f4c00cce2240cb92e3b071c4c1a023c0ce2453eb13cc264a317b1f76285bd1
+DIST puzzles-20170514.7bdfda8.tar.gz 2910137 SHA256 
fa7e0e7d2f4bf43d4d5d91e0836ad87a133657a99f00ec5ee77504cd8bafda58 SHA512 
b0acbc1cf3e2986c6c3a58a126ff4e9e8751e93ee9a4771e2fd8af6c98c01bbbe01db8ccc526fdbac1ee8bf9a4391c9b90d66e19458fdc53858a6a3724c02a4b
 WHIRLPOOL 
bae1cd85b3d4973db5e8610cb9b023a39fe5ee11386723e44d4ef7464615f9373d5b10f2d8cf325257709b3184ee40453b0262e22e427a8353f0e9c1c74adc51
 DIST sgt-puzzles-icons-20160315.tar.xz 715536 SHA256 
9ddc1b6d02b3c3358a9bc6b17c7070650f794cf5f650f25b2ac7e5def6674447 SHA512 
2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57
 WHIRLPOOL 
17bdadc9519320bc88af27f2db7a9c243f04d80e524db51ad9398831185e2c66f2430006c324fa7d5b70ce156cb9df93d9405216053b32101b5f56035a60f6ac

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20170506.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-20170514.ebuild
similarity index 98%
rename from games-puzzle/sgt-puzzles/sgt-puzzles-20170506.ebuild
rename to games-puzzle/sgt-puzzles/sgt-puzzles-20170514.ebuild
index ce233796c43..483e2dc3387 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20170506.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20170514.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]] ; then

SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz;
KEYWORDS=""
 else
-   MAGIC=23a5372
+   MAGIC=7bdfda8

SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz;
S=${WORKDIR}/puzzles-${PV}.${MAGIC}
KEYWORDS="~amd64 ~x86"
@@ -35,7 +35,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
dev-lang/perl
virtual/pkgconfig
-   doc? ( >=app-doc/halibut-1.0 )"
+   doc? ( >=app-doc/halibut-1.2 )"
 
 PATCHES=( "${FILESDIR}/${PN}-20161207-builtin-help.patch" )
 

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
index ce233796c43..483e2dc3387 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]] ; then

SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz;
KEYWORDS=""
 else
-   MAGIC=23a5372
+   MAGIC=7bdfda8

SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz;
S=${WORKDIR}/puzzles-${PV}.${MAGIC}
KEYWORDS="~amd64 ~x86"
@@ -35,7 +35,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
dev-lang/perl
virtual/pkgconfig
-   doc? ( >=app-doc/halibut-1.0 )"
+   doc? ( >=app-doc/halibut-1.2 )"
 
 PATCHES=( "${FILESDIR}/${PN}-20161207-builtin-help.patch" )

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/

2017-05-07 Thread NP Hardass 
commit: e7dae32d5f17951e2f55815f074ceb251c633d69
Author: NP-Hardass  gentoo  org>
AuthorDate: Sun May  7 06:32:54 2017 +
Commit: NP Hardass  gentoo  org>
CommitDate: Sun May  7 06:36:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7dae32d

games-puzzle/sgt-puzzles: Stabilize 20170314, drop old

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 games-puzzle/sgt-puzzles/Manifest  |   1 -
 .../sgt-puzzles/sgt-puzzles-20170228.ebuild| 113 -
 .../sgt-puzzles/sgt-puzzles-20170314.ebuild|   2 +-
 3 files changed, 1 insertion(+), 115 deletions(-)

diff --git a/games-puzzle/sgt-puzzles/Manifest 
b/games-puzzle/sgt-puzzles/Manifest
index 2359e3454b5..519638ae6ad 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -1,3 +1,2 @@
-DIST puzzles-20170228.1f613ba.tar.gz 2898117 SHA256 
e53bf0800daae37c9be25fd260b0010a44178ca7a5ccc70b29b96fe85060d80a SHA512 
41d73461984c589ed18ca2a8cab3871e87a1b56b2d38a8b11c0cb95150423cecbf5ddb76a2e9db4b9109980576527ae2fa7d2663e41dceee8847efc0044766b2
 WHIRLPOOL 
482c88b96d97878708771ccb6aacd38de527787e0a2ca9c6ba16ef48f917d0f269022530e849cfbc5ec74a04753f0aea42dd20a76a24bbd804566b1c07131e88
 DIST puzzles-20170314.eedea41.tar.gz 2897824 SHA256 
57c156fa7de2605a4ae0f18e54ce20ef4e08b8faf32d26eccf5a7fa545940fa8 SHA512 
ef7d12e0e20aef487a18b572a4464f3e23b226fae599cc22fdb34348f6c3baf3dcd21207c8fedef0ac3a6c4344b13e520767efef8830aaa2ad4b914285f8aa3c
 WHIRLPOOL 
17b069ae171497212411ed6696fafd00108064f3a28ce38925a4fc6d9040e3d072a14920b024c329e597fe1fdedc9723089ea5c17d7df9226ac45ba612a1de70
 DIST sgt-puzzles-icons-20160315.tar.xz 715536 SHA256 
9ddc1b6d02b3c3358a9bc6b17c7070650f794cf5f650f25b2ac7e5def6674447 SHA512 
2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57
 WHIRLPOOL 
17bdadc9519320bc88af27f2db7a9c243f04d80e524db51ad9398831185e2c66f2430006c324fa7d5b70ce156cb9df93d9405216053b32101b5f56035a60f6ac

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20170228.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-20170228.ebuild
deleted file mode 100644
index 9b10bce098b..000
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20170228.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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} == "" ]] ; 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=1f613ba
-   
SRC_URI="http://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="http://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.0 )"
-
-PATCHES=( "${FILESDIR}/${PN}-20161207-builtin-help.patch" )
-
-src_unpack() {
-   default
-   if [[ ${PV} == "" ]]; 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} == "" ]]; 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
-
-

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/

2017-05-07 Thread NP Hardass 
commit: 44af06119d95336469d2fe547faf1f58f393fe4f
Author: NP-Hardass  gentoo  org>
AuthorDate: Sun May  7 06:35:44 2017 +
Commit: NP Hardass  gentoo  org>
CommitDate: Sun May  7 06:36:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44af0611

games-puzzle/sgt-puzzles: Bump to 20170506

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 games-puzzle/sgt-puzzles/Manifest   | 1 +
 .../{sgt-puzzles-.ebuild => sgt-puzzles-20170506.ebuild}| 2 +-
 games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild| 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/games-puzzle/sgt-puzzles/Manifest 
b/games-puzzle/sgt-puzzles/Manifest
index 519638ae6ad..3603f1bc82e 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -1,2 +1,3 @@
 DIST puzzles-20170314.eedea41.tar.gz 2897824 SHA256 
57c156fa7de2605a4ae0f18e54ce20ef4e08b8faf32d26eccf5a7fa545940fa8 SHA512 
ef7d12e0e20aef487a18b572a4464f3e23b226fae599cc22fdb34348f6c3baf3dcd21207c8fedef0ac3a6c4344b13e520767efef8830aaa2ad4b914285f8aa3c
 WHIRLPOOL 
17b069ae171497212411ed6696fafd00108064f3a28ce38925a4fc6d9040e3d072a14920b024c329e597fe1fdedc9723089ea5c17d7df9226ac45ba612a1de70
+DIST puzzles-20170506.23a5372.tar.gz 2895770 SHA256 
9a5167f782100b15bf0da969c8b5b6c6f343c9c2b3417615ffc640cc09b4aee9 SHA512 
a807e9a8fb5ddbfc564f60da63886a6ce068f59077fbc3312bcf928a432b754d36db8878ee8aa8cabff7f12efddf51fb1e60f927b8bfc86cd5ebc16c367f64b5
 WHIRLPOOL 
1852267e731a21c60bca9c8d1506a21839ed65e83266d400f592106af8ff79d4a8f4c00cce2240cb92e3b071c4c1a023c0ce2453eb13cc264a317b1f76285bd1
 DIST sgt-puzzles-icons-20160315.tar.xz 715536 SHA256 
9ddc1b6d02b3c3358a9bc6b17c7070650f794cf5f650f25b2ac7e5def6674447 SHA512 
2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57
 WHIRLPOOL 
17bdadc9519320bc88af27f2db7a9c243f04d80e524db51ad9398831185e2c66f2430006c324fa7d5b70ce156cb9df93d9405216053b32101b5f56035a60f6ac

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-20170506.ebuild
similarity index 99%
copy from games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
copy to games-puzzle/sgt-puzzles/sgt-puzzles-20170506.ebuild
index 824c7f94307..cf3b22e1784 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20170506.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]] ; then

SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz;
KEYWORDS=""
 else
-   MAGIC=eedea41
+   MAGIC=23a5372

SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz;
S=${WORKDIR}/puzzles-${PV}.${MAGIC}
KEYWORDS="~amd64 ~x86"

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
index 824c7f94307..cf3b22e1784 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]] ; then

SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz;
KEYWORDS=""
 else
-   MAGIC=eedea41
+   MAGIC=23a5372

SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz;
S=${WORKDIR}/puzzles-${PV}.${MAGIC}
KEYWORDS="~amd64 ~x86"

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/files/, games-puzzle/sgt-puzzles/

2017-04-10 Thread NP Hardass 
commit: c5df9eb77cfebf99930f846ad59140f2693680c6
Author: NP-Hardass  gentoo  org>
AuthorDate: Fri Apr  7 06:21:39 2017 +
Commit: NP Hardass  gentoo  org>
CommitDate: Mon Apr 10 17:21:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5df9eb7

games-puzzle/sgt-puzzles: Bump to 20170314

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 games-puzzle/sgt-puzzles/Manifest| 1 +
 games-puzzle/sgt-puzzles/files/sgt-puzzles.menu  | 5 -
 .../{sgt-puzzles-.ebuild => sgt-puzzles-20170314.ebuild} | 4 ++--
 games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/games-puzzle/sgt-puzzles/Manifest 
b/games-puzzle/sgt-puzzles/Manifest
index 67721e6b50c..2359e3454b5 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -1,2 +1,3 @@
 DIST puzzles-20170228.1f613ba.tar.gz 2898117 SHA256 
e53bf0800daae37c9be25fd260b0010a44178ca7a5ccc70b29b96fe85060d80a SHA512 
41d73461984c589ed18ca2a8cab3871e87a1b56b2d38a8b11c0cb95150423cecbf5ddb76a2e9db4b9109980576527ae2fa7d2663e41dceee8847efc0044766b2
 WHIRLPOOL 
482c88b96d97878708771ccb6aacd38de527787e0a2ca9c6ba16ef48f917d0f269022530e849cfbc5ec74a04753f0aea42dd20a76a24bbd804566b1c07131e88
+DIST puzzles-20170314.eedea41.tar.gz 2897824 SHA256 
57c156fa7de2605a4ae0f18e54ce20ef4e08b8faf32d26eccf5a7fa545940fa8 SHA512 
ef7d12e0e20aef487a18b572a4464f3e23b226fae599cc22fdb34348f6c3baf3dcd21207c8fedef0ac3a6c4344b13e520767efef8830aaa2ad4b914285f8aa3c
 WHIRLPOOL 
17b069ae171497212411ed6696fafd00108064f3a28ce38925a4fc6d9040e3d072a14920b024c329e597fe1fdedc9723089ea5c17d7df9226ac45ba612a1de70
 DIST sgt-puzzles-icons-20160315.tar.xz 715536 SHA256 
9ddc1b6d02b3c3358a9bc6b17c7070650f794cf5f650f25b2ac7e5def6674447 SHA512 
2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57
 WHIRLPOOL 
17bdadc9519320bc88af27f2db7a9c243f04d80e524db51ad9398831185e2c66f2430006c324fa7d5b70ce156cb9df93d9405216053b32101b5f56035a60f6ac

diff --git a/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu 
b/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu
index ddcb2df5b6a..e3f3264cff9 100644
--- a/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu
+++ b/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu
@@ -4,13 +4,16 @@
   Applications
   
 Games
+
+  X-sgt-puzzles
+
 
   Puzzles
   sgt-puzzles.directory
   

  
-  sgt-puzzles
+  X-sgt-puzzles

   
  

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild
similarity index 98%
copy from games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
copy to games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild
index d67926d4458..824c7f94307 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]] ; then

SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz;
KEYWORDS=""
 else
-   MAGIC=1f613ba
+   MAGIC=eedea41

SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz;
S=${WORKDIR}/puzzles-${PV}.${MAGIC}
KEYWORDS="~amd64 ~x86"
@@ -84,7 +84,7 @@ src_install() {
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;${PN};"
+   make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" 
"Game;LogicGame;X-${PN};"
done
 
if use doc ; then

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
index d67926d4458..824c7f94307 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]] ; then

SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz;
KEYWORDS=""
 else
-   MAGIC=1f613ba
+   MAGIC=eedea41

SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz;
S=${WORKDIR}/puzzles-${PV}.${MAGIC}
KEYWORDS="~amd64 ~x86"
@@ -84,7 +84,7 @@ src_install() {
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;${PN};"
+   make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}"

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/

2017-04-10 Thread NP Hardass 
commit: 7734fbd82a689870b2a81ad2fd823425ca1652e7
Author: NP-Hardass  gentoo  org>
AuthorDate: Fri Apr  7 06:34:18 2017 +
Commit: NP Hardass  gentoo  org>
CommitDate: Mon Apr 10 17:21:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7734fbd8

games-puzzle/sgt-puzzles: Fixed desktop categories

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 games-puzzle/sgt-puzzles/sgt-puzzles-20170228.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20170228.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-20170228.ebuild
index 7463b9beb4b..9b10bce098b 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20170228.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20170228.ebuild
@@ -84,7 +84,7 @@ src_install() {
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;${PN};"
+   make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" 
"Game;LogicGame;X-${PN};"
done
 
if use doc ; then

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/

2017-04-10 Thread NP Hardass 
commit: 33f353f3684ed5070e9be645e369261c7f46a562
Author: NP-Hardass  gentoo  org>
AuthorDate: Fri Apr  7 06:18:40 2017 +
Commit: NP Hardass  gentoo  org>
CommitDate: Mon Apr 10 17:21:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33f353f3

games-puzzle/sgt-puzzles: amd64, x86 stable

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 games-puzzle/sgt-puzzles/sgt-puzzles-20170228.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20170228.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-20170228.ebuild
index d67926d4458..7463b9beb4b 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20170228.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20170228.ebuild
@@ -15,7 +15,7 @@ else
MAGIC=1f613ba

SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz;
S=${WORKDIR}/puzzles-${PV}.${MAGIC}
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Simon Tatham's Portable Puzzle Collection"

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/

2017-04-10 Thread NP Hardass 
commit: 4d877ad4ced549d654c76d3428ba05f60a5dcb72
Author: NP-Hardass  gentoo  org>
AuthorDate: Fri Apr  7 06:19:07 2017 +
Commit: NP Hardass  gentoo  org>
CommitDate: Mon Apr 10 17:21:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d877ad4

games-puzzle/sgt-puzzles: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 games-puzzle/sgt-puzzles/Manifest  |   2 -
 games-puzzle/sgt-puzzles/metadata.xml  |   1 -
 .../sgt-puzzles/sgt-puzzles-20160315.ebuild| 106 ---
 .../sgt-puzzles/sgt-puzzles-20161207.ebuild| 113 -
 4 files changed, 222 deletions(-)

diff --git a/games-puzzle/sgt-puzzles/Manifest 
b/games-puzzle/sgt-puzzles/Manifest
index a299275025d..67721e6b50c 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -1,4 +1,2 @@
-DIST puzzles-20160315.c0bc13c.tar.gz 2838135 SHA256 
fc557d3a1021a1e56ae63589d08788a8ccdfa1772e4c74cbbade5fefcf4e691f SHA512 
9317ab26605982d5a97cec57596bd3e75cb1cb93b2bc14f6f295cf3950a759b21c5262e3eb04a3c3cda1d3d1cf4ff9477ee7fac9d310558567714e8e1cfc3496
 WHIRLPOOL 
7cc52ecabbfda7f71c64c02cc4ca434a20e637e25754d00b3f397318d0dd120aaf7ea19faafbb7eee259b7c2ca91e8e396d7667e4b1fa7fc6a153f15a69fb52f
-DIST puzzles-20161207.b958129.tar.gz 2897516 SHA256 
d8b93252c06a1fb25e0888e67b9e92a435a02fc746c89149e9cff77b44760ec3 SHA512 
d937ebcf9aa7d4aa603a5ffec8bb2b3c533df855718288d380072b5e2518ed791eb5b23388c489e31decc9c25ef6a7b42b26fae5b76f1e75df246487d05a8d78
 WHIRLPOOL 
06f98af4e476421d3a6207f98de0851cdf4dae3446568c10808326acde24de8b54afb03c3667bef88ebdd3fba1d693993a64c0f2d6a2eeb8e43ff2ca32dc2c50
 DIST puzzles-20170228.1f613ba.tar.gz 2898117 SHA256 
e53bf0800daae37c9be25fd260b0010a44178ca7a5ccc70b29b96fe85060d80a SHA512 
41d73461984c589ed18ca2a8cab3871e87a1b56b2d38a8b11c0cb95150423cecbf5ddb76a2e9db4b9109980576527ae2fa7d2663e41dceee8847efc0044766b2
 WHIRLPOOL 
482c88b96d97878708771ccb6aacd38de527787e0a2ca9c6ba16ef48f917d0f269022530e849cfbc5ec74a04753f0aea42dd20a76a24bbd804566b1c07131e88
 DIST sgt-puzzles-icons-20160315.tar.xz 715536 SHA256 
9ddc1b6d02b3c3358a9bc6b17c7070650f794cf5f650f25b2ac7e5def6674447 SHA512 
2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57
 WHIRLPOOL 
17bdadc9519320bc88af27f2db7a9c243f04d80e524db51ad9398831185e2c66f2430006c324fa7d5b70ce156cb9df93d9405216053b32101b5f56035a60f6ac

diff --git a/games-puzzle/sgt-puzzles/metadata.xml 
b/games-puzzle/sgt-puzzles/metadata.xml
index b5380df3abf..a434a63e3f4 100644
--- a/games-puzzle/sgt-puzzles/metadata.xml
+++ b/games-puzzle/sgt-puzzles/metadata.xml
@@ -12,6 +12,5 @@


Use x11-libs/gtk+:3 instead of 
x11-libs/gtk+:2
-   Use Gentoo packaged icons instead of bundled 
icons

 

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20160315.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-20160315.ebuild
deleted file mode 100644
index f683bb608ad..000
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20160315.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils gnome2-utils toolchain-funcs games autotools
-
-if [[ ${PV} == "" ]] ; then
-   EGIT_REPO_URI="git://git.tartarus.org/simon/puzzles.git"
-   inherit git-r3
-   SRC_URI=""
-   KEYWORDS=""
-else
-   MAGIC=c0bc13c
-   
SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz;
-   S=${WORKDIR}/puzzles-${PV}.${MAGIC}
-   KEYWORDS="amd64 x86"
-fi
-
-GENTOO_ICONS="20160315"
-SRC_URI="${SRC_URI}
-   
https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz
-"
-
-DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
-HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/;
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc gtk3 icons"
-
-RDEPEND="
-   !gtk3? ( x11-libs/gtk+:2 )
-   gtk3? ( x11-libs/gtk+:3 )
-"
-DEPEND="${RDEPEND}
-   dev-lang/perl
-   virtual/pkgconfig
-   doc? ( >=app-doc/halibut-1.0 )"
-
-src_unpack() {
-   [[ ${PV} == "" ]] && git-r3_src_unpack
-   unpack ${A}
-}
-
-src_prepare() {
-   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
-   if [[ ${PV} == "" ]] || use icons; then
-   cp -R ../${PN}-icons/icons . || die
-   fi
-}
-
-src_configure() {
-   econf --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() {
-

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/

2017-03-12 Thread NP Hardass 
commit: 90f124b7e07779c8ebe0641070b8fcb1ee1450e2
Author: NP-Hardass  gentoo  org>
AuthorDate: Fri Mar  3 06:19:05 2017 +
Commit: NP Hardass  gentoo  org>
CommitDate: Sun Mar 12 21:26:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90f124b7

games-puzzle/sgt-puzzles: Bump to 20170228, #602696

Package-Manager: portage-2.3.0

 games-puzzle/sgt-puzzles/Manifest| 1 +
 .../{sgt-puzzles-.ebuild => sgt-puzzles-20170228.ebuild} | 5 +++--
 games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/games-puzzle/sgt-puzzles/Manifest 
b/games-puzzle/sgt-puzzles/Manifest
index c45233c4f26..a299275025d 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -1,3 +1,4 @@
 DIST puzzles-20160315.c0bc13c.tar.gz 2838135 SHA256 
fc557d3a1021a1e56ae63589d08788a8ccdfa1772e4c74cbbade5fefcf4e691f SHA512 
9317ab26605982d5a97cec57596bd3e75cb1cb93b2bc14f6f295cf3950a759b21c5262e3eb04a3c3cda1d3d1cf4ff9477ee7fac9d310558567714e8e1cfc3496
 WHIRLPOOL 
7cc52ecabbfda7f71c64c02cc4ca434a20e637e25754d00b3f397318d0dd120aaf7ea19faafbb7eee259b7c2ca91e8e396d7667e4b1fa7fc6a153f15a69fb52f
 DIST puzzles-20161207.b958129.tar.gz 2897516 SHA256 
d8b93252c06a1fb25e0888e67b9e92a435a02fc746c89149e9cff77b44760ec3 SHA512 
d937ebcf9aa7d4aa603a5ffec8bb2b3c533df855718288d380072b5e2518ed791eb5b23388c489e31decc9c25ef6a7b42b26fae5b76f1e75df246487d05a8d78
 WHIRLPOOL 
06f98af4e476421d3a6207f98de0851cdf4dae3446568c10808326acde24de8b54afb03c3667bef88ebdd3fba1d693993a64c0f2d6a2eeb8e43ff2ca32dc2c50
+DIST puzzles-20170228.1f613ba.tar.gz 2898117 SHA256 
e53bf0800daae37c9be25fd260b0010a44178ca7a5ccc70b29b96fe85060d80a SHA512 
41d73461984c589ed18ca2a8cab3871e87a1b56b2d38a8b11c0cb95150423cecbf5ddb76a2e9db4b9109980576527ae2fa7d2663e41dceee8847efc0044766b2
 WHIRLPOOL 
482c88b96d97878708771ccb6aacd38de527787e0a2ca9c6ba16ef48f917d0f269022530e849cfbc5ec74a04753f0aea42dd20a76a24bbd804566b1c07131e88
 DIST sgt-puzzles-icons-20160315.tar.xz 715536 SHA256 
9ddc1b6d02b3c3358a9bc6b17c7070650f794cf5f650f25b2ac7e5def6674447 SHA512 
2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57
 WHIRLPOOL 
17bdadc9519320bc88af27f2db7a9c243f04d80e524db51ad9398831185e2c66f2430006c324fa7d5b70ce156cb9df93d9405216053b32101b5f56035a60f6ac

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-20170228.ebuild
similarity index 97%
copy from games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
copy to games-puzzle/sgt-puzzles/sgt-puzzles-20170228.ebuild
index 7cb101ed307..a1c46cf6d3b 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20170228.ebuild
@@ -1,5 +1,6 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+# $Id$
 
 EAPI=6
 
@@ -12,7 +13,7 @@ if [[ ${PV} == "" ]] ; then

SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz;
KEYWORDS=""
 else
-   MAGIC=b958129
+   MAGIC=1f613ba

SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz;
S=${WORKDIR}/puzzles-${PV}.${MAGIC}
KEYWORDS="~amd64 ~x86"

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
index 7cb101ed307..d67926d4458 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]] ; then

SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz;
KEYWORDS=""
 else
-   MAGIC=b958129
+   MAGIC=1f613ba

SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz;
S=${WORKDIR}/puzzles-${PV}.${MAGIC}
KEYWORDS="~amd64 ~x86"

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/files/, games-puzzle/sgt-puzzles/

2016-12-12 Thread NP Hardass 
commit: 49e5e31aabe16db2ee990d5e50701905ae2b4938
Author: NP-Hardass  gentoo  org>
AuthorDate: Thu Dec  8 15:17:55 2016 +
Commit: NP Hardass  gentoo  org>
CommitDate: Mon Dec 12 14:50:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49e5e31a

games-puzzle/sgt-puzzles: Large changeset, fixes #593480

Drop games eclass support
Bump to EAPI=6
Rename binaries to avoid filename collisions
Sort xdg menu entries
In app help options
Various ebuild improvements

Package-Manager: portage-2.3.0

 games-puzzle/sgt-puzzles/Manifest  |   1 +
 .../files/sgt-puzzles-20161207-builtin-help.patch  | 107 +
 .../sgt-puzzles/files/sgt-puzzles.directory|   4 +
 games-puzzle/sgt-puzzles/files/sgt-puzzles.menu|  18 
 ....ebuild => sgt-puzzles-20161207.ebuild} |  67 +++--
 .../sgt-puzzles/sgt-puzzles-.ebuild|  67 +++--
 6 files changed, 204 insertions(+), 60 deletions(-)

diff --git a/games-puzzle/sgt-puzzles/Manifest 
b/games-puzzle/sgt-puzzles/Manifest
index 2550a33..c45233c 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -1,2 +1,3 @@
 DIST puzzles-20160315.c0bc13c.tar.gz 2838135 SHA256 
fc557d3a1021a1e56ae63589d08788a8ccdfa1772e4c74cbbade5fefcf4e691f SHA512 
9317ab26605982d5a97cec57596bd3e75cb1cb93b2bc14f6f295cf3950a759b21c5262e3eb04a3c3cda1d3d1cf4ff9477ee7fac9d310558567714e8e1cfc3496
 WHIRLPOOL 
7cc52ecabbfda7f71c64c02cc4ca434a20e637e25754d00b3f397318d0dd120aaf7ea19faafbb7eee259b7c2ca91e8e396d7667e4b1fa7fc6a153f15a69fb52f
+DIST puzzles-20161207.b958129.tar.gz 2897516 SHA256 
d8b93252c06a1fb25e0888e67b9e92a435a02fc746c89149e9cff77b44760ec3 SHA512 
d937ebcf9aa7d4aa603a5ffec8bb2b3c533df855718288d380072b5e2518ed791eb5b23388c489e31decc9c25ef6a7b42b26fae5b76f1e75df246487d05a8d78
 WHIRLPOOL 
06f98af4e476421d3a6207f98de0851cdf4dae3446568c10808326acde24de8b54afb03c3667bef88ebdd3fba1d693993a64c0f2d6a2eeb8e43ff2ca32dc2c50
 DIST sgt-puzzles-icons-20160315.tar.xz 715536 SHA256 
9ddc1b6d02b3c3358a9bc6b17c7070650f794cf5f650f25b2ac7e5def6674447 SHA512 
2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57
 WHIRLPOOL 
17bdadc9519320bc88af27f2db7a9c243f04d80e524db51ad9398831185e2c66f2430006c324fa7d5b70ce156cb9df93d9405216053b32101b5f56035a60f6ac

diff --git 
a/games-puzzle/sgt-puzzles/files/sgt-puzzles-20161207-builtin-help.patch 
b/games-puzzle/sgt-puzzles/files/sgt-puzzles-20161207-builtin-help.patch
new file mode 100644
index ..a5c3a36
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/files/sgt-puzzles-20161207-builtin-help.patch
@@ -0,0 +1,107 @@
+Based on 
http://sources.debian.net/patches/sgt-puzzles/20160429.b31155b-1/202_online-help.diff/
+Simply opens HTML help files with xdg-open
+
+Author: Ben Hutchings 
+Description: Add HTML-based online help
+
+This works along the same lines as the Windows implementation,
+though we have to try a bit harder to find a help browser.
+
+--- a/gtk.c2016-12-08 07:53:06.812409184 -0500
 b/gtk.c2016-12-08 07:58:06.426415886 -0500
+@@ -2,6 +2,10 @@
+  * gtk.c: GTK front end for my puzzle collection.
+  */
+ 
++#ifndef _POSIX_C_SOURCE
++#define _POSIX_C_SOURCE 1 /* for PATH_MAX */
++#endif
++
+ #include 
+ #include 
+ #include 
+@@ -10,6 +14,9 @@
+ #include 
+ #include 
+ #include 
++#include 
++#include 
++#include 
+ 
+ #include 
+ #include 
+@@ -2270,6 +2277,37 @@
+ resize_fe(fe);
+ }
+ 
++static void show_help(frontend *fe, const char *topic)
++{
++char path[PATH_MAX + 1];
++
++sprintf(path, "%s/%s.html", HTMLDIR, topic);
++if (access(path, R_OK) != 0) {
++error_box(fe->window, "Help file could not be found");
++return;
++}
++
++const char *argv[3];
++
++argv[0] = "xdg-open";
++argv[1] = path;
++argv[2] = NULL;
++if (! g_spawn_async(NULL, (char **)argv, NULL,
++  G_SPAWN_SEARCH_PATH,
++  NULL, NULL, NULL, NULL))
++error_box(fe->window, "Failed to open help file");
++}
++
++static void menu_help_contents_event(GtkMenuItem *menuitem, gpointer data)
++{
++show_help((frontend *)data, "index");
++}
++
++static void menu_help_specific_event(GtkMenuItem *menuitem, gpointer data)
++{
++show_help((frontend *)data, thegame.htmlhelp_topic);
++}
++
+ static void menu_about_event(GtkMenuItem *menuitem, gpointer data)
+ {
+ frontend *fe = (frontend *)data;
+@@ -2590,6 +2628,25 @@
+ menu = gtk_menu_new();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu);
+ 
++menuitem = gtk_menu_item_new_with_label("Contents");
++gtk_container_add(GTK_CONTAINER(menu), menuitem);
++g_signal_connect(G_OBJECT(menuitem), "activate",
++ G_CALLBACK(menu_help_contents_event), fe);
++gtk_widget_show(menuitem);
++
++if (thegame.htmlhelp_topic) {
++char *item;
++

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/, games-puzzle/sgt-puzzles/files/

2016-07-28 Thread NP Hardass 
commit: 7ad73ab5adf81e02ef2d131ac5949cebcb8cc733
Author: NP-Hardass  gentoo  org>
AuthorDate: Tue Jul 26 18:56:25 2016 +
Commit: NP Hardass  gentoo  org>
CommitDate: Fri Jul 29 04:48:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ad73ab5

games-puzzle/sgt-puzzles: Drop old

Package-Manager: portage-2.2.28

 games-puzzle/sgt-puzzles/Manifest  |  1 -
 .../files/sgt-puzzles-9861-gentoo.patch| 23 --
 games-puzzle/sgt-puzzles/sgt-puzzles-9861.ebuild   | 88 --
 3 files changed, 112 deletions(-)

diff --git a/games-puzzle/sgt-puzzles/Manifest 
b/games-puzzle/sgt-puzzles/Manifest
index 7754d2c..2550a33 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -1,3 +1,2 @@
 DIST puzzles-20160315.c0bc13c.tar.gz 2838135 SHA256 
fc557d3a1021a1e56ae63589d08788a8ccdfa1772e4c74cbbade5fefcf4e691f SHA512 
9317ab26605982d5a97cec57596bd3e75cb1cb93b2bc14f6f295cf3950a759b21c5262e3eb04a3c3cda1d3d1cf4ff9477ee7fac9d310558567714e8e1cfc3496
 WHIRLPOOL 
7cc52ecabbfda7f71c64c02cc4ca434a20e637e25754d00b3f397318d0dd120aaf7ea19faafbb7eee259b7c2ca91e8e396d7667e4b1fa7fc6a153f15a69fb52f
-DIST puzzles-r9861.tar.gz 3255388 SHA256 
cc08ffd96c20dfe249d6db0e97f32608e8c52da9ca00a0e8d7d67fd4a474c3a2 SHA512 
fc8abf5912e7ecdf5c5166c6b8f354e5f6dc8c42d646ffeae812c3cea21496f9ff03671268453a32c3246d1c94dfaba83628bf65ebeb645b3deb208ee3045ba1
 WHIRLPOOL 
1f91bc25d5c8dbf531d71eb3783169477834c232810f529cf682d69a121688584af7dc51b00c380e85dfee3119f9644d2f741f4c9f9dfc2054bc72fa5dd88de5
 DIST sgt-puzzles-icons-20160315.tar.xz 715536 SHA256 
9ddc1b6d02b3c3358a9bc6b17c7070650f794cf5f650f25b2ac7e5def6674447 SHA512 
2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57
 WHIRLPOOL 
17bdadc9519320bc88af27f2db7a9c243f04d80e524db51ad9398831185e2c66f2430006c324fa7d5b70ce156cb9df93d9405216053b32101b5f56035a60f6ac

diff --git a/games-puzzle/sgt-puzzles/files/sgt-puzzles-9861-gentoo.patch 
b/games-puzzle/sgt-puzzles/files/sgt-puzzles-9861-gentoo.patch
deleted file mode 100644
index c4ac19e..000
--- a/games-puzzle/sgt-puzzles/files/sgt-puzzles-9861-gentoo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ru puzzles-r9861.orig/mkfiles.pl puzzles-r9861/mkfiles.pl
 puzzles-r9861.orig/mkfiles.pl  2013-03-30 16:16:21.0 -0400
-+++ puzzles-r9861/mkfiles.pl   2013-06-11 17:59:54.255885226 -0400
-@@ -1117,8 +1117,8 @@
- "\n".
- ("CFLAGS := -O2 -Wall -Werror -ansi -pedantic -g " .
-  (join " ", map {"-I$dirpfx$_"} @srcdirs) .
-- " `\$(GTK_CONFIG) --cflags` \$(CFLAGS)")."\n".
--"XLIBS = `\$(GTK_CONFIG) --libs` -lm\n".
-+ " `pkg-config gtk+-2.0 --cflags` \$(CFLAGS)")."\n".
-+"XLIBS = `pkg-config gtk+-2.0 --libs` -lm\n".
- "ULIBS = -lm#\n".
- "INSTALL=install\n",
- "INSTALL_PROGRAM=\$(INSTALL)\n",
-@@ -1138,7 +1138,7 @@
-   $objstr = ($p, "X.o", undef, undef);
-   print ("\$(BINPREFIX)" . $prog . ": " . $objstr), "\n";
-   $libstr = ($p, undef, undef, "-lX");
--  print ("\t\$(CC) -o \$@ $objstr $libstr \$(XLFLAGS) 
\$(${type}LIBS)", 69),
-+  print ("\t\$(CC) \$(LDFLAGS) -o \$@ $objstr $libstr 
\$(XLFLAGS) \$(${type}LIBS)", 69),
- "\n\n";
- }
- foreach $d (("X.o", undef, $dirpfx, "/")) {

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-9861.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-9861.ebuild
deleted file mode 100644
index 9879da7..000
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-9861.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils gnome2-utils toolchain-funcs games
-if [[ ${PV} == "" ]] ; 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
-   virtual/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)"
-   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
-   dodoc

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/

2016-03-31 Thread NP Hardass 
commit: 28b5997a8ad0e134c8231f2a42cd92df2a6b5785
Author: NP-Hardass  gentoo  org>
AuthorDate: Thu Mar 31 10:51:05 2016 +
Commit: NP Hardass  gentoo  org>
CommitDate: Thu Mar 31 20:01:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28b5997a

games-puzzle/sgt-puzzles: Version bump to 20160315

Adds support for GTK3.  Adds flag to use icons packaged by NP-Hardass
instead of bundled to bypass buggy colors in bundled icons.  These
repackaged icons are used regardless for the live ebuild as it does
not ship with icons.

Package-Manager: portage-2.2.26

 games-puzzle/sgt-puzzles/Manifest  |   2 +
 games-puzzle/sgt-puzzles/metadata.xml  |  17 +++-
 .../sgt-puzzles/sgt-puzzles-20160315.ebuild| 107 +
 .../sgt-puzzles/sgt-puzzles-.ebuild|  77 +--
 4 files changed, 167 insertions(+), 36 deletions(-)

diff --git a/games-puzzle/sgt-puzzles/Manifest 
b/games-puzzle/sgt-puzzles/Manifest
index 46566bc..7754d2c 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -1 +1,3 @@
+DIST puzzles-20160315.c0bc13c.tar.gz 2838135 SHA256 
fc557d3a1021a1e56ae63589d08788a8ccdfa1772e4c74cbbade5fefcf4e691f SHA512 
9317ab26605982d5a97cec57596bd3e75cb1cb93b2bc14f6f295cf3950a759b21c5262e3eb04a3c3cda1d3d1cf4ff9477ee7fac9d310558567714e8e1cfc3496
 WHIRLPOOL 
7cc52ecabbfda7f71c64c02cc4ca434a20e637e25754d00b3f397318d0dd120aaf7ea19faafbb7eee259b7c2ca91e8e396d7667e4b1fa7fc6a153f15a69fb52f
 DIST puzzles-r9861.tar.gz 3255388 SHA256 
cc08ffd96c20dfe249d6db0e97f32608e8c52da9ca00a0e8d7d67fd4a474c3a2 SHA512 
fc8abf5912e7ecdf5c5166c6b8f354e5f6dc8c42d646ffeae812c3cea21496f9ff03671268453a32c3246d1c94dfaba83628bf65ebeb645b3deb208ee3045ba1
 WHIRLPOOL 
1f91bc25d5c8dbf531d71eb3783169477834c232810f529cf682d69a121688584af7dc51b00c380e85dfee3119f9644d2f741f4c9f9dfc2054bc72fa5dd88de5
+DIST sgt-puzzles-icons-20160315.tar.xz 715536 SHA256 
9ddc1b6d02b3c3358a9bc6b17c7070650f794cf5f650f25b2ac7e5def6674447 SHA512 
2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57
 WHIRLPOOL 
17bdadc9519320bc88af27f2db7a9c243f04d80e524db51ad9398831185e2c66f2430006c324fa7d5b70ce156cb9df93d9405216053b32101b5f56035a60f6ac

diff --git a/games-puzzle/sgt-puzzles/metadata.xml 
b/games-puzzle/sgt-puzzles/metadata.xml
index 78274e0..b5380df 100644
--- a/games-puzzle/sgt-puzzles/metadata.xml
+++ b/games-puzzle/sgt-puzzles/metadata.xml
@@ -1,8 +1,17 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-   ga...@gentoo.org
-   Gentoo Games Project
-
+   
+   ga...@gentoo.org
+   Gentoo Games Project
+   
+   
+   np-hard...@gentoo.org
+   NP-Hardass
+   Co-maintainer; CC on all bugs
+   
+   
+   Use x11-libs/gtk+:3 instead of 
x11-libs/gtk+:2
+   Use Gentoo packaged icons instead of bundled 
icons
+   
 

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20160315.ebuild 
b/games-puzzle/sgt-puzzles/sgt-puzzles-20160315.ebuild
new file mode 100644
index 000..6f1a68d
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20160315.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils gnome2-utils toolchain-funcs games autotools
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="git://git.tartarus.org/simon/puzzles.git"
+   inherit git-r3
+   SRC_URI=""
+   KEYWORDS=""
+else
+   MAGIC=c0bc13c
+   
SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz;
+   S=${WORKDIR}/puzzles-${PV}.${MAGIC}
+   KEYWORDS="~amd64 ~x86"
+fi
+
+GENTOO_ICONS="20160315"
+SRC_URI="${SRC_URI}
+   
https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz
+"
+
+DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
+HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/;
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc gtk3 icons"
+
+RDEPEND="
+   !gtk3? ( x11-libs/gtk+:2 )
+   gtk3? ( x11-libs/gtk+:3 )
+"
+DEPEND="${RDEPEND}
+   dev-lang/perl
+   virtual/pkgconfig
+   doc? ( >=app-doc/halibut-1.0 )"
+
+src_unpack() {
+   [[ ${PV} == "" ]] && git-r3_src_unpack
+   unpack ${A}
+}
+
+src_prepare() {
+   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
+   if [[ ${PV} == "" ]] || use icons; then
+   cp -R ../${PN}-icons/icons . || die
+   fi
+}
+
+src_configure() {
+   econf --with-gtk=$(usex gtk3 3 2)
+}
+
+src_compile() {
+   emake CC="$(tc-getCC)"
+   if