From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-943521-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 1A4EC139694
for <garchives@archives.gentoo.org>; Mon, 10 Apr 2017 17:23:19 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C4DE221C09F;
Mon, 10 Apr 2017 17:22:59 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 919C321C09F
for <gentoo-commits@lists.gentoo.org>; Mon, 10 Apr 2017 17:22:59 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 75DAF340DF9
for <gentoo-commits@lists.gentoo.org>; Mon, 10 Apr 2017 17:22:58 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id CC45673F3
for <gentoo-commits@lists.gentoo.org>; Mon, 10 Apr 2017 17:22:56 +0000 (UTC)
From: "NP Hardass" <np-hardass@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "NP Hardass" <np-hardass@gentoo.org>
Message-ID: <1491844899.4d877ad4ced549d654c76d3428ba05f60a5dcb72.np-hardass@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/
X-VCS-Repository: repo/gentoo
X-VCS-Files: games-puzzle/sgt-puzzles/Manifest games-puzzle/sgt-puzzles/metadata.xml games-puzzle/sgt-puzzles/sgt-puzzles-20160315.ebuild games-puzzle/sgt-puzzles/sgt-puzzles-20161207.ebuild
X-VCS-Directories: games-puzzle/sgt-puzzles/
X-VCS-Committer: np-hardass
X-VCS-Committer-Name: NP Hardass
X-VCS-Revision: 4d877ad4ced549d654c76d3428ba05f60a5dcb72
X-VCS-Branch: master
Date: Mon, 10 Apr 2017 17:22:56 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 93ff7650-d664-48e8-9f0a-638db10353dc
X-Archives-Hash: 1141a87b4d50ec6f221fc9e7745caacf
commit: 4d877ad4ced549d654c76d3428ba05f60a5dcb72
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 7 06:19:07 2017 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 17:21:39 2017 +0000
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 @@
</maintainer>
<use>
<flag name="gtk3">Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2</flag>
- <flag name="icons">Use Gentoo packaged icons instead of bundled icons</flag>
</use>
</pkgmetadata>
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..00000000000
--- 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} == "99999999" ]] ; 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} == "99999999" ]] && 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} == "99999999" ]] || 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() {
- dodir "${GAMES_BINDIR}"
- emake DESTDIR="${D}" bindir="${GAMES_BINDIR}" install
- dodoc README
-
- 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 "${GAMES_BINDIR}/${file}" "${name}" "${PN}-${file}"
- done
-
- if use doc ; then
- dohtml *.html
- doinfo puzzles.info{,-1,-2,-3}
- dodoc puzzles.pdf puzzles.ps puzzles.txt
- fi
-
- 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-puzzle/sgt-puzzles/sgt-puzzles-20161207.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-20161207.ebuild
deleted file mode 100644
index 7cb101ed307..00000000000
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20161207.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2016 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=b958129
- 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} == "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;${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
-}