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 EE0481382C5 for ; Fri, 14 May 2021 15:38:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3923CE0870; Fri, 14 May 2021 15:38:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 199AAE0870 for ; Fri, 14 May 2021 15:38:02 +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 6DB43335C8E for ; Fri, 14 May 2021 15:37:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E642F644 for ; Fri, 14 May 2021 15:37:57 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1621006671.25e9ca17fb3b7e7c9f2554e642614b83330fda9b.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-board/pioneers/, games-board/pioneers/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-board/pioneers/Manifest games-board/pioneers/files/pioneers-15.6-slibtool.patch games-board/pioneers/pioneers-15.6.ebuild X-VCS-Directories: games-board/pioneers/files/ games-board/pioneers/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 25e9ca17fb3b7e7c9f2554e642614b83330fda9b X-VCS-Branch: master Date: Fri, 14 May 2021 15:37:57 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 24530499-9b14-42e5-95d0-0c35534f687c X-Archives-Hash: 8086b5541df19b7a7aa31b77ddc1863c commit: 25e9ca17fb3b7e7c9f2554e642614b83330fda9b Author: Lars Wendler gentoo org> AuthorDate: Fri May 14 14:22:55 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri May 14 15:37:51 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25e9ca17 games-board/pioneers: Version bump to 15.6 Upstream-PR: https://sourceforge.net/p/pio/patches/680/ Thanks-to: orbea riseup.net> Closes: https://bugs.gentoo.org/778248 Signed-off-by: Lars Wendler gentoo.org> games-board/pioneers/Manifest | 1 + .../pioneers/files/pioneers-15.6-slibtool.patch | 27 ++++++++++++ games-board/pioneers/pioneers-15.6.ebuild | 48 ++++++++++++++++++++++ 3 files changed, 76 insertions(+) diff --git a/games-board/pioneers/Manifest b/games-board/pioneers/Manifest index 082da1f9eb6..d9b0752862d 100644 --- a/games-board/pioneers/Manifest +++ b/games-board/pioneers/Manifest @@ -1 +1,2 @@ DIST pioneers-15.5.tar.gz 4975627 BLAKE2B 8cae5df3e122743819196f0442ba18cedcfd4fee51d9e76ef4137f120e3429456f58ca9d6e537b8e0206c937d882b4a22d76ae333a7d5d7dc69d65f7bbd94b18 SHA512 a3261197348d7e994da81ad4948755520bf29678614a9ea2b2cacc81622093c6460b0cee671a04c125684d88a9ee1deb9206ccb73ab1440be1a1505e24b2ed2a +DIST pioneers-15.6.tar.gz 5054353 BLAKE2B 0e6cbe51a801c3eb84b8f4f08359f9d1d166e6ae1c8e66e748d15214d23a9f11b9deea7645778d453e32ea2dc171bca2d70b2f54fb88e5f50e9d0726bdff7a0e SHA512 683ba851d4dc85244edea7f9b183d6c9b7ef93cdc948f3375f8434f2f455ac0a3688a6a914ab8ad8a86d5067bba8f563c181ef8c8ccf00df6a985e801dc1c213 diff --git a/games-board/pioneers/files/pioneers-15.6-slibtool.patch b/games-board/pioneers/files/pioneers-15.6-slibtool.patch new file mode 100644 index 00000000000..f754255930c --- /dev/null +++ b/games-board/pioneers/files/pioneers-15.6-slibtool.patch @@ -0,0 +1,27 @@ +From a53a5621c278db74aaffa21bbf135be1d4a55ea2 Mon Sep 17 00:00:00 2001 +From: orbea +Date: Fri, 7 May 2021 12:05:45 -0700 +Subject: [PATCH] build: Don't link the same object twice. + +--- + Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index af5d0bf..9012a57 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -47,10 +47,8 @@ gtk_cflags = \ + $(GTK_CFLAGS) \ + $(GTK_DEPRECATION) + +-# The Fink port needs an explicit reference to driver.o + console_libs = \ + libpioneers.a \ +- $(top_builddir)/common/libpioneers_a-driver.o \ + $(GLIB2_LIBS) \ + $(GIO2_LIBS) + +-- +2.26.3 + diff --git a/games-board/pioneers/pioneers-15.6.ebuild b/games-board/pioneers/pioneers-15.6.ebuild new file mode 100644 index 00000000000..ea5507a831a --- /dev/null +++ b/games-board/pioneers/pioneers-15.6.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GNOME2_EAUTORECONF=yes + +inherit gnome2 + +DESCRIPTION="Clone of the popular board game The Settlers of Catan" +HOMEPAGE="http://pio.sourceforge.net/" +SRC_URI="mirror://sourceforge/pio/${P}.tar.gz" + +LICENSE="GPL-2 CC-BY-SA-4.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="dedicated help nls" + +# dev-util/gob only for autoreconf +RDEPEND=" + >=dev-libs/glib-2.28:2 + !dedicated? ( + >=x11-libs/gtk+-3.22:3 + >=x11-libs/libnotify-0.7.4 + help? ( app-text/yelp-tools ) + ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/gob:2 + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +DOCS=( AUTHORS ChangeLog README TODO NEWS ) + +PATCHES=( "${FILESDIR}/${P}-slibtool.patch" ) + +src_configure() { + gnome2_src_configure \ + $(use_enable nls) \ + $(use_enable help) \ + --includedir=/usr/include \ + $(use_with !dedicated gtk) +} + +src_install() { + gnome2_src_install scrollkeeper_localstate_dir="${ED}"/var/lib/scrollkeeper/ +}