gentoo resync : 22.05.2021

3 files changed, 78 insertions, 0 deletions

diff --git a/games-board/pioneers/Manifest b/games-board/pioneers/Manifest
index a1bd1aa732fa..40cbb43a8f5f 100644
--- a/games-board/pioneers/Manifest
+++ b/games-board/pioneers/Manifest
@@ -1,4 +1,7 @@
 AUX pioneers-15.5-fno-common.patch 465 BLAKE2B 1ea0122a77ddb954760067ecae5e2704ea7e76ff221ba13126502dc7217ff89592da64f54df4f2d0f99a3567019d4f7db1e73109f3efbabd4959531a563ffa3c SHA512 b37a07ea641d271ade5a243e38b8be71aa8a144332e99079f2dc50f168e943eb914a86381034aadc679382a521e7247ef3e2965844310dbe527b2a5a168cf404
+AUX pioneers-15.6-slibtool.patch 625 BLAKE2B 480e92d8faff48c6a92faa949c7313652ce803bf77c45a4bf81950cd6b4bece2235ba4005cd9921805a175efa4f641eee2c5f4a33dfc452e535b6b52d100c28a SHA512 803296cb8b82106d83b34ae78a75ce0b0c7323af4e0ad17e67c93547339f09265403fda93ad8c86bd61fc3ff8e927b154efe9ac24ebbf82ebab3ae5dd5e5d61f
 DIST pioneers-15.5.tar.gz 4975627 BLAKE2B 8cae5df3e122743819196f0442ba18cedcfd4fee51d9e76ef4137f120e3429456f58ca9d6e537b8e0206c937d882b4a22d76ae333a7d5d7dc69d65f7bbd94b18 SHA512 a3261197348d7e994da81ad4948755520bf29678614a9ea2b2cacc81622093c6460b0cee671a04c125684d88a9ee1deb9206ccb73ab1440be1a1505e24b2ed2a
+DIST pioneers-15.6.tar.gz 5054353 BLAKE2B 0e6cbe51a801c3eb84b8f4f08359f9d1d166e6ae1c8e66e748d15214d23a9f11b9deea7645778d453e32ea2dc171bca2d70b2f54fb88e5f50e9d0726bdff7a0e SHA512 683ba851d4dc85244edea7f9b183d6c9b7ef93cdc948f3375f8434f2f455ac0a3688a6a914ab8ad8a86d5067bba8f563c181ef8c8ccf00df6a985e801dc1c213
 EBUILD pioneers-15.5.ebuild 1000 BLAKE2B fbea3987216593c661826a308d0d678f1a112751cc809bb09f2d663d139d7529ff389eef3590e03ad20909040bb9420d6efec61c6ba6b4ea6cc726722a1dded3 SHA512 e1a1e4bd50cbb60c19812b8e49cfd5b451f1a94e6d7efe93cd5fb617320035eb532c4138cc91aeafd4ff7c40e11c6b2d3c5eae9c52546a2b8c76ed12aafc5725
+EBUILD pioneers-15.6.ebuild 1028 BLAKE2B ce0c2869bb830c6b9e5ebff927f5287609268497588cdc34d93586e971d4966f4e96c2700a1412aa81aaa8ff157f36ef82e5d0847c88de6fce37e106f3925b8a SHA512 43d97397822e530d0a3c063b865ef7d83e3e3c3d44a885d429ea4c1f82c5f8b62ab74e85eec06cd3632b0478723307d43a69983f90ccc1c138350e7f447dd790
 MISC metadata.xml 410 BLAKE2B f48738bf8713786682fa5faedf3ced41b5799418c30b4ac206380387ba64cabb033cbd24468a355d6bf420a65102e2af84f38eab51d28a06a372dfb4d65e940f SHA512 92f6de9f201427ff4063c7604eb0fb2bf7b75ac6ba53bea290efe317042e7022ccf73bc6bbe6307c247786f7009dca27a710f1f13036d8c837305cde84966189
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 000000000000..f754255930c5
--- /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 <orbea@riseup.net>
+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 000000000000..ea5507a831ad
--- /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/
+}