clean old; tidy patching

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

9 files changed, 18 insertions, 341 deletions

diff --git a/games-strategy/liquidwar6/ChangeLog b/games-strategy/liquidwar6/ChangeLog
index a44d1df4c6be..de4b04a125c9 100644
--- a/games-strategy/liquidwar6/ChangeLog
+++ b/games-strategy/liquidwar6/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for games-strategy/liquidwar6
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar6/ChangeLog,v 1.10 2014/11/25 23:21:48 hasufell Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar6/ChangeLog,v 1.11 2015/01/26 17:41:27 mr_bones_ Exp $
+
+  26 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/liquidwar6-0.4.3681-ldconfig.patch,
+  +files/liquidwar6-0.4.3681-paths.patch,
+  -files/liquidwar6-0.0.13_beta-ldconfig.patch,
+  -files/liquidwar6-0.0.13_beta-libpng-1.6.patch,
+  -files/liquidwar6-0.0.13_beta-paths.patch,
+  -files/liquidwar6-0.2.3551-ldconfig.patch,
+  -files/liquidwar6-0.2.3551-paths.patch, -liquidwar6-0.0.13_beta.ebuild,
+  -liquidwar6-0.2.3551.ebuild, liquidwar6-0.4.3681.ebuild:
+  clean old; tidy patching
 
   25 Nov 2014; Julian Ospald <hasufell@gentoo.org> metadata.xml:
   drop maintainership
diff --git a/games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-ldconfig.patch b/games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-ldconfig.patch
deleted file mode 100644
index a9cbff467097..000000000000
--- a/games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-ldconfig.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit b69515e24f9ea066a7e393fa7b364e0701a8f58c
-Author: hasufell <hasufell@gentoo.org>
-Date:   Mon Sep 30 00:11:04 2013 +0200
-
-    don't run ldconfig
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index da78107..a0961b8 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -55,7 +55,6 @@ EXTRA_DIST = scriptpo.c indent.sh scriptpo-update.sh stamp.sh clean.sh dtou.sh u
- SUBDIRS = lib
- 
- install-exec-local:
--	if which id && which ldconfig && test `id -u` -eq 0 && test "$(prefix)" != "/usr"; then ldconfig; fi # Run ldconfig automatically if we're root
- 	if test -x $(DESTDIR)$(bindir)/liquidwar6; then mv $(DESTDIR)$(bindir)/liquidwar6 $(DESTDIR)$(bindir)/@PACKAGE_TARNAME@-@PACKAGE_VERSION@; ln -s @PACKAGE_TARNAME@-@PACKAGE_VERSION@ $(DESTDIR)$(bindir)/liquidwar6; fi
- 
- uninstall-local:
diff --git a/games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-libpng-1.6.patch b/games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-libpng-1.6.patch
deleted file mode 100644
index e5dec5d87610..000000000000
--- a/games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-libpng-1.6.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit 0246d8e24c49e2ed12c183f0cde08d2e16b4c299
-Author: hasufell <hasufell@gentoo.org>
-Date:   Mon Sep 30 00:10:54 2013 +0200
-
-    allow building with libpng-1.6
-
-diff --git a/configure.ac b/configure.ac
-index 2a8cba9..334b96e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -47,7 +47,7 @@ LW6_CODENAME="Blackbeard"
- AC_SUBST(LW6_CODENAME)
- 
- dnl Headers, some are optional
--AC_CHECK_HEADERS(arpa/inet.h ctype.h dirent.h errno.h execinfo.h expat.h fcntl.h gmp.h GL/gl.h GL/glu.h iconv.h ifaddrs.h jpeglib.h langinfo.h libintl.h libpng12/png.h libpng13/png.h libpng14/png.h libpng15/png.h lmcons.h limits.h locale.h ltdl.h mach/vm_statistics.h mach/mach_types.h mach/mach_init.h mach/mach_host.h math.h netdb.h netinet/in.h omp.h pthread.h readline/history.h readline/readline.h SDL/SDL.h SDL/SDL_image.h SDL/SDL_mixer.h SDL/SDL_ttf.h signal.h stdarg.h stdio.h stdlib.h string.h syslog.h sys/select.h sys/signal.h sys/socket.h sys/stat.h sys/sysinfo.h sys/time.h sys/types.h sys/utsname.h time.h unistd.h winbase.h windows.h winsock2.h)
-+AC_CHECK_HEADERS(arpa/inet.h ctype.h dirent.h errno.h execinfo.h expat.h fcntl.h gmp.h GL/gl.h GL/glu.h iconv.h ifaddrs.h jpeglib.h langinfo.h libintl.h libpng12/png.h libpng13/png.h libpng14/png.h libpng15/png.h libpng16/png.h lmcons.h limits.h locale.h ltdl.h mach/vm_statistics.h mach/mach_types.h mach/mach_init.h mach/mach_host.h math.h netdb.h netinet/in.h omp.h pthread.h readline/history.h readline/readline.h SDL/SDL.h SDL/SDL_image.h SDL/SDL_mixer.h SDL/SDL_ttf.h signal.h stdarg.h stdio.h stdlib.h string.h syslog.h sys/select.h sys/signal.h sys/socket.h sys/stat.h sys/sysinfo.h sys/time.h sys/types.h sys/utsname.h time.h unistd.h winbase.h windows.h winsock2.h)
- 
- AM_MISSING_PROG(PERL, perl, ${missing_dir})
- AM_MISSING_PROG(AWK, awk, ${missing_dir})
-@@ -319,7 +319,8 @@ AC_CHECK_HEADER(libpng12/png.h, HAVE_LIBPNG12_PNG_H=1)
- AC_CHECK_HEADER(libpng13/png.h, HAVE_LIBPNG13_PNG_H=1)
- AC_CHECK_HEADER(libpng14/png.h, HAVE_LIBPNG14_PNG_H=1)
- AC_CHECK_HEADER(libpng15/png.h, HAVE_LIBPNG15_PNG_H=1)
--if test x${HAVE_LIBPNG12_PNG_H} = x1 || test x${HAVE_LIBPNG13_PNG_H} = x1 || test x${HAVE_LIBPNG14_PNG_H} = x1 || test x${HAVE_LIBPNG15_PNG_H} = x1; then
-+AC_CHECK_HEADER(libpng16/png.h, HAVE_LIBPNG16_PNG_H=1)
-+if test x${HAVE_LIBPNG12_PNG_H} = x1 || test x${HAVE_LIBPNG13_PNG_H} = x1 || test x${HAVE_LIBPNG14_PNG_H} = x1 || test x${HAVE_LIBPNG15_PNG_H} = x1 || test x${HAVE_LIBPNG16_PNG_H} = x1; then
-    if test x${HAVE_LIBPNG12_PNG_H} = x1; then
-       LIBPNG_1X_H=libpng12/png.h
-    fi
-@@ -332,9 +333,12 @@ if test x${HAVE_LIBPNG12_PNG_H} = x1 || test x${HAVE_LIBPNG13_PNG_H} = x1 || tes
-    if test x${HAVE_LIBPNG15_PNG_H} = x1; then
-       LIBPNG_1X_H=libpng15/png.h
-    fi
-+   if test x${HAVE_LIBPNG16_PNG_H} = x1; then
-+      LIBPNG_1X_H=libpng16/png.h
-+   fi
- else
-    AC_MSG_ERROR([
--*** Liquid War 6 needs libpng 1.2 1.3 1.4 or 1.5 (http://www.libpng.org/pub/png/libpng.html)
-+*** Liquid War 6 needs libpng 1.2 1.3 1.4 1.5 or 1.6 (http://www.libpng.org/pub/png/libpng.html)
- ])
- fi
- AC_SUBST(LIBPNG_1X_H)
diff --git a/games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-paths.patch b/games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-paths.patch
deleted file mode 100644
index 2ae15b80dfb4..000000000000
--- a/games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-paths.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-commit e204ce228f5aafc7efd2c09fb4b0bfefe9708dfe
-Author: hasufell <hasufell@gentoo.org>
-Date:   Mon Sep 30 00:19:48 2013 +0200
-
-    make paths modifiable
-
-diff --git a/configure.ac b/configure.ac
-index 334b96e..d846210 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -698,6 +698,20 @@ else
- fi
- AC_SUBST(VALGRIND_CFLAGS)
- 
-+AC_ARG_WITH([iconsdir],
-+			[AS_HELP_STRING([--with-iconsdir=DIR],
-+							[path where icons get installed (default: $datadir/icons/hicolor/48x48/apps)])],
-+			[ICONSDIR="$withval"],
-+			[ICONSDIR='$(datadir)/pixmaps'])
-+AC_SUBST(ICONSDIR)
-+
-+AC_ARG_WITH([desktopdir],
-+			[AS_HELP_STRING([--with-desktopdir=DIR],
-+							[path where desktop files get installed (default: $datadir/applications)])],
-+			[DESKTOPDIR="$withval"],
-+			[DESKTOPDIR='$(datadir)/applications'])
-+AC_SUBST(DESKTOPDIR)
-+
- if test x${USE_INCLUDED_LIBINTL} = xyes ; then
-    LW6_LIBINTL_LDFLAGS=
-    LW6_LIBINTL_LDADD=${LTLIBINTL}
-diff --git a/data/icon/Makefile.am b/data/icon/Makefile.am
-index b4d5ae4..f9b738c 100644
---- a/data/icon/Makefile.am
-+++ b/data/icon/Makefile.am
-@@ -19,6 +19,6 @@
- # Contact author        : ufoot@ufoot.org
- 
- pkgdata_DATA = liquidwar6.png liquidwar6.xpm
--pkgdatadir = $(datadir)/pixmaps
-+pkgdatadir = $(ICONSDIR)
- EXTRA_DIST = $(pkgdata_DATA) liquidwar6.ico liquidwar6.icns
- 
-diff --git a/pkg/Makefile.am b/pkg/Makefile.am
-index 37f73ee..1980369 100644
---- a/pkg/Makefile.am
-+++ b/pkg/Makefile.am
-@@ -19,7 +19,7 @@
- # Contact author        : ufoot@ufoot.org
- 
- pkgdata_DATA = liquidwar6.desktop
--pkgdatadir = $(datadir)/applications
-+pkgdatadir = $(DESKTOPDIR)
- EXTRA_DIST =  $(pkgdata_DATA) liquidwar6.spec liquidwar6d
- 
- distclean-local:
diff --git a/games-strategy/liquidwar6/files/liquidwar6-0.2.3551-ldconfig.patch b/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-ldconfig.patch
index d1a6685ca606..dd5e702b6144 100644
--- a/games-strategy/liquidwar6/files/liquidwar6-0.2.3551-ldconfig.patch
+++ b/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-ldconfig.patch
@@ -4,8 +4,6 @@ Date:   Wed Jan 8 17:21:09 2014 +0100
 
     don't run ldconfig
 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index f319a74..47463c1 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -65,7 +65,6 @@ EXTRA_DIST = scriptpo.c indent.sh scriptpo-update.sh stamp.sh clean.sh dtou.sh u
diff --git a/games-strategy/liquidwar6/files/liquidwar6-0.2.3551-paths.patch b/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-paths.patch
index c77251d3f999..3ac69032471e 100644
--- a/games-strategy/liquidwar6/files/liquidwar6-0.2.3551-paths.patch
+++ b/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-paths.patch
@@ -4,8 +4,6 @@ Date:   Wed Jan 8 17:23:56 2014 +0100
 
     respect datarootdir
 
-diff --git a/data/icon/Makefile.am b/data/icon/Makefile.am
-index 0bca199..ae5cf79 100644
 --- a/data/icon/Makefile.am
 +++ b/data/icon/Makefile.am
 @@ -19,6 +19,6 @@
@@ -16,8 +14,6 @@ index 0bca199..ae5cf79 100644
 +pkgdatadir = $(datarootdir)/pixmaps
  EXTRA_DIST = $(pkgdata_DATA) liquidwar6.ico liquidwar6.icns
  
-diff --git a/pkg/Makefile.am b/pkg/Makefile.am
-index 6fc2957..ac86bb8 100644
 --- a/pkg/Makefile.am
 +++ b/pkg/Makefile.am
 @@ -19,7 +19,7 @@
diff --git a/games-strategy/liquidwar6/liquidwar6-0.0.13_beta.ebuild b/games-strategy/liquidwar6/liquidwar6-0.0.13_beta.ebuild
deleted file mode 100644
index 774e3a48f4a0..000000000000
--- a/games-strategy/liquidwar6/liquidwar6-0.0.13_beta.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar6/liquidwar6-0.0.13_beta.ebuild,v 1.3 2014/05/15 17:05:28 ulm Exp $
-
-EAPI=5
-
-inherit autotools eutils toolchain-funcs games
-
-MY_PV=${PV/_beta/beta}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Unique multiplayer wargame between liquids"
-HOMEPAGE="http://www.gnu.org/software/liquidwar6/"
-SRC_URI="http://www.ufoot.org/download/liquidwar/v6/${MY_PV}/${MY_P}.tar.gz
-	maps? ( http://www.ufoot.org/download/liquidwar/v6/${MY_PV}/${PN}-extra-maps-${MY_PV}.tar.gz )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gtk +maps nls +ogg openmp readline"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/expat
-	dev-scheme/guile
-	media-libs/freetype:2
-	media-libs/libpng:0
-	media-libs/libsdl[X,opengl,video]
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-ttf
-	net-misc/curl
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg
-	virtual/opengl
-	gtk? ( x11-libs/gtk+:2 )
-	nls? ( virtual/libintl
-		virtual/libiconv )
-	ogg? (
-		media-libs/libsdl[X,sound,opengl,video]
-		media-libs/sdl-mixer[vorbis]
-	)
-	readline? ( sys-libs/ncurses
-		sys-libs/readline )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-S_MAPS=${WORKDIR}/${PN}-extra-maps-${MY_PV}
-
-pkg_setup() {
-	if use openmp; then
-		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
-		fi
-	fi
-	games_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libpng-1.6.patch \
-		"${FILESDIR}"/${P}-ldconfig.patch \
-		"${FILESDIR}"/${P}-paths.patch
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf \
-		$(use_enable nls) \
-		--enable-mod-gl \
-		$(use_enable gtk) \
-		$(use_enable openmp) \
-		$(use_enable ogg mod-ogg) \
-		$(use_enable !ogg silent) \
-		$(use_enable readline console) \
-		--disable-static \
-		--mandir=/usr/share/man \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--with-iconsdir=/usr/share/pixmaps \
-		--with-desktopdir=/usr/share/applications
-
-	if use maps; then
-		cd "${S_MAPS}" || die
-		egamesconf
-	fi
-}
-
-src_compile() {
-	default
-	use doc && emake html
-	use maps && emake -C "${S_MAPS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use maps && emake -C "${S_MAPS}" DESTDIR="${D}" install
-	prune_libtool_files --all
-	prepgamesdirs
-}
diff --git a/games-strategy/liquidwar6/liquidwar6-0.2.3551.ebuild b/games-strategy/liquidwar6/liquidwar6-0.2.3551.ebuild
deleted file mode 100644
index b68594307b03..000000000000
--- a/games-strategy/liquidwar6/liquidwar6-0.2.3551.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar6/liquidwar6-0.2.3551.ebuild,v 1.3 2014/11/06 05:55:34 vapier Exp $
-
-EAPI=5
-
-inherit autotools eutils toolchain-funcs games
-
-MY_PV=${PV/_beta/beta}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Unique multiplayer wargame between liquids"
-HOMEPAGE="http://www.gnu.org/software/liquidwar6/"
-SRC_URI="http://www.ufoot.org/download/liquidwar/v6/${MY_PV}/${MY_P}.tar.gz
-	maps? ( http://www.ufoot.org/download/liquidwar/v6/${MY_PV}/${PN}-extra-maps-${MY_PV}.tar.gz )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gles2 gtk libcaca +maps nls +ogg openmp readline test"
-
-# yes, cunit is rdep
-RDEPEND="dev-db/sqlite:3
-	dev-libs/expat
-	dev-scheme/guile
-	dev-util/cunit
-	media-libs/freetype:2
-	media-libs/libpng:0
-	media-libs/libsdl[X,opengl,video]
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-ttf
-	net-misc/curl
-	dev-libs/libltdl:0
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg
-	virtual/opengl
-	libcaca? ( media-libs/libcaca )
-	gles2? ( media-libs/mesa[gles2] )
-	gtk? ( x11-libs/gtk+:2 )
-	nls? ( virtual/libintl
-		virtual/libiconv )
-	ogg? (
-		media-libs/libsdl[X,sound,opengl,video]
-		media-libs/sdl-mixer[vorbis]
-	)
-	readline? ( sys-libs/ncurses
-		sys-libs/readline )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-S_MAPS=${WORKDIR}/${PN}-extra-maps-${MY_PV}
-
-pkg_setup() {
-	if use openmp; then
-		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
-		fi
-	fi
-	games_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-{ldconfig,paths}.patch
-
-	sed -i \
-		-e 's/-Werror//' \
-		configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	# configure fails with cunit disabled
-	egamesconf \
-		$(use_enable nls) \
-		--enable-cunit \
-		$(use_enable gtk) \
-		--enable-mod-gl1 \
-		$(use_enable gles2 mod-gles2) \
-		$(use_enable libcaca mod-caca) \
-		$(use_enable openmp) \
-		$(use_enable ogg mod-ogg) \
-		$(use_enable !ogg silent) \
-		$(use_enable readline console) \
-		--disable-static \
-		--datarootdir=/usr/share \
-		--mandir=/usr/share/man \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html
-
-	if use maps; then
-		cd "${S_MAPS}" || die
-		egamesconf
-	fi
-}
-
-src_compile() {
-	default
-	use doc && emake html
-	use maps && emake -C "${S_MAPS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use maps && emake -C "${S_MAPS}" DESTDIR="${D}" install
-	prune_libtool_files --all
-	prepgamesdirs
-}
diff --git a/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild b/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild
index 33ade918ca23..8b7d35ac7069 100644
--- a/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild
+++ b/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild,v 1.6 2014/11/06 05:55:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild,v 1.7 2015/01/26 17:41:27 mr_bones_ Exp $
 
 EAPI=5
 
@@ -65,8 +65,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.2.3551-{ldconfig,paths}.patch \
-		"${FILESDIR}"/${PN}-0.4.3681-check-headers.patch
+	epatch \
+		"${FILESDIR}"/${P}-{ldconfig,paths}.patch \
+		"${FILESDIR}"/${P}-check-headers.patch
 
 	sed -i \
 		-e 's/-Werror//' \