old

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 5 insertions, 122 deletions

diff --git a/games-board/pioneers/ChangeLog b/games-board/pioneers/ChangeLog
index 34e113cce289..94bd61bdb84f 100644
--- a/games-board/pioneers/ChangeLog
+++ b/games-board/pioneers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/pioneers
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pioneers/ChangeLog,v 1.48 2015/02/21 12:24:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pioneers/ChangeLog,v 1.49 2015/03/12 18:48:21 mr_bones_ Exp $
+
+  12 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/pioneers-15.1-build.patch, -pioneers-15.1-r1.ebuild:
+  old
 
   21 Feb 2015; Agostino Sarubbo <ago@gentoo.org> pioneers-15.3.ebuild:
   Stable for ppc, wrt bug #539382
diff --git a/games-board/pioneers/files/pioneers-15.1-build.patch b/games-board/pioneers/files/pioneers-15.1-build.patch
deleted file mode 100644
index fa3590ff413f..000000000000
--- a/games-board/pioneers/files/pioneers-15.1-build.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Thu Dec 19 21:30:53 UTC 2013
-
-* add --with-help switch
-* add --enable-minimal-flags switch
-* don't use AM_CFLAGS in configure.ac, it is bad form
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -129,21 +129,40 @@
-   *)    pioneers_deprecationChecks=no  ;;
- esac])
- 
-+AC_ARG_ENABLE([minimal-flags],
-+	AS_HELP_STRING([--enable-minimal-flags],
-+		["Don't add unneeded flags."]),
-+[case "${enableval}" in
-+  yes)  minimal_flags=yes ;;
-+  "")   minimal_flags=no ;;
-+  *)    minimal_flags=no  ;;
-+esac])
-+
-+AC_ARG_WITH([help],
-+	AS_HELP_STRING([--with-help],
-+		[Enable gnome help via scrollkeeper.]),
-+[case "${withval}" in
-+  yes)  with_help=yes ;;
-+  "")   with_help=yes ;;
-+  *)    with_help=no  ;;
-+esac])
-+
-+
- ## The warnings are in the same order as in 'man gcc'
--if test "x$GCC" = xyes; then
-+if test "x$GCC" = xyes && test "x$minimal_flags" != xyes; then
- 	# Flags from Debian hardening (dpkg-buildflags --get CFLAGS)
--	AC_SUBST(AM_CFLAGS, ["$AM_CFLAGS -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security"])
--	AC_SUBST(AM_CFLAGS, ["$AM_CFLAGS -D_FORTIFY_SOURCE=2"])
--	AC_SUBST(AM_CFLAGS, ["$AM_CFLAGS -pie -fPIE"])
-+	CFLAGS="$CFLAGS -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security"
-+	CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
-+	CFLAGS="$CFLAGS -pie -fPIE"
- 
- 	if test "$pioneers_is_windows_port" = "no"; then
- 	 	# Flags from Debian hardening (dpkg-buildflags --get LDFLAGS)
--		AC_SUBST(AM_LDFLAGS, ["$AM_LDFLAGS -Wl,-z,relro"])
--		AC_SUBST(AM_LDFLAGS, ["$AM_LDFLAGS -Wl,-z,now"])
-+		LDFLAGS="$LDFLAGS -Wl,-z,relro"
-+		LDFLAGS="$LDFLAGS -Wl,-z,now"
- 	fi
- 
--	# Only link the directly needed libraries	
--	AC_SUBST(AM_CFLAGS, ["$AM_CFLAGS -Wl,--as-needed"])
-+	# Only link the directly needed libraries
-+	LDFLAGS="$LDFLAGS -Wl,--as-needed"
- 
- 	if test "$pioneers_warnings" = yes -o "$pioneers_warnings" = full; then
- 		AC_SUBST(WARNINGS, "-Wall")
-@@ -385,7 +404,7 @@
- AM_GLIB_GNU_GETTEXT
- 
- if test $pioneers_is_mingw_port = yes; then
--	AC_SUBST(AM_CFLAGS, "-mms-bitfields $AM_CFLAGS")
-+	CFLAGS="-mms-bitfields $CFLAGS"
- 	# No console window for the graphical applications
- 	AC_SUBST(GTK2_LIBS, "$GTK2_LIBS -mwindows")
- 	# Don't use bin, lib and share subdirectories
diff --git a/games-board/pioneers/pioneers-15.1-r1.ebuild b/games-board/pioneers/pioneers-15.1-r1.ebuild
deleted file mode 100644
index dfddfb90b08a..000000000000
--- a/games-board/pioneers/pioneers-15.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pioneers/pioneers-15.1-r1.ebuild,v 1.4 2014/10/18 14:33:56 ago Exp $
-
-# NOTE: "QA Notice: Unrecognized configure options --with-gtk" is a false-positive
-
-EAPI=5
-inherit autotools eutils gnome-games
-
-DESCRIPTION="A 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"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="dedicated help nls"
-
-# dev-util/gob only for autoreconf
-RDEPEND=">=dev-libs/glib-2.6:2
-	!dedicated?	(
-		>=x11-libs/gtk+-2.6:2
-		x11-libs/libnotify
-		help? (
-			>=app-text/scrollkeeper-0.3.8
-			>=gnome-base/libgnome-2.10
-		)
-	)
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/gob:2
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome-games_src_configure \
-		$(use_enable nls) \
-		--enable-minimal-flags \
-		$(use_with help) \
-		--includedir=/usr/include \
-		$(use_with !dedicated gtk)
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog README TODO NEWS" \
-	gnome2_src_install scrollkeeper_localstate_dir="${ED%/}"/var/lib/scrollkeeper/
-	prepgamesdirs
-}