From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 96AD7139695 for ; Sun, 7 May 2017 06:36:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95796E0DC8; Sun, 7 May 2017 06:36:48 +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 67413E0DC8 for ; Sun, 7 May 2017 06:36:48 +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 16CC83416DD for ; Sun, 7 May 2017 06:36:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CDF907448 for ; Sun, 7 May 2017 06:36:44 +0000 (UTC) From: "NP Hardass" 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" Message-ID: <1494138997.e7dae32d5f17951e2f55815f074ceb251c633d69.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/sgt-puzzles-20170228.ebuild games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild X-VCS-Directories: games-puzzle/sgt-puzzles/ X-VCS-Committer: np-hardass X-VCS-Committer-Name: NP Hardass X-VCS-Revision: e7dae32d5f17951e2f55815f074ceb251c633d69 X-VCS-Branch: master Date: Sun, 7 May 2017 06:36:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6ac0279c-e77c-4880-8bc5-aafc6ad86f6d X-Archives-Hash: a996269dafc9377664688d9356bf3566 commit: e7dae32d5f17951e2f55815f074ceb251c633d69 Author: NP-Hardass gentoo org> AuthorDate: Sun May 7 06:32:54 2017 +0000 Commit: NP Hardass gentoo org> CommitDate: Sun May 7 06:36:37 2017 +0000 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..00000000000 --- 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} == "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=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} == "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-20170314.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild index 824c7f94307..ec67b9f3b61 100644 --- a/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild +++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild @@ -15,7 +15,7 @@ else 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" + KEYWORDS="amd64 x86" fi DESCRIPTION="Simon Tatham's Portable Puzzle Collection"