clean old; tidy patching

Package-Manager: portage-2.2.14/cvs/Linux x86_64

10 files changed, 22 insertions, 376 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/Manifest b/games-strategy/liquidwar6/Manifest
index b231324d560c..0ec77892372c 100644
--- a/games-strategy/liquidwar6/Manifest
+++ b/games-strategy/liquidwar6/Manifest
@@ -1,39 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX liquidwar6-0.0.13_beta-ldconfig.patch 793 SHA256 8661d7a682d191bc56f417abc5ac7e1473db79c883ad0dcea0552dc572615164 SHA512 39bf164d7f3d6f4df8d656b4a93d3fe6d36234520ebe6ae71af827a71e14beb08b5043810b9967995ae69fa65b1b932bb6a8b36e4dbc22b1c1163fb7f60cc9ca WHIRLPOOL 575b4751d99042c321c5c4f6bef21b463854fd1163eabc72f3b8b0a3324fd33e8da13ee194826e3fc78b4ec278e9265779dd88dbc2080d05329d11d22034efa0
-AUX liquidwar6-0.0.13_beta-libpng-1.6.patch 3063 SHA256 3374fd86098a05e2b8ca80e5a5790bdd31627aacb02d17e630adf4a5bce98fc8 SHA512 880734bc20f9d276369f1f889ce4d6dc7bafadac3b6ba4e47af83b299bda33c2bebb5b1bf8a38f3ca2fc474d7a059110d6fce8a0dbefe2fa38c9a85c7060abd5 WHIRLPOOL a1d1c95c6081b2fbfb1692ef05860a7c842942ad892ce186b95bd4c6064537a4d3d4598420f0a2825f9a0bab0d57e7062051ca1e7e6edb4bc61849010c9ee75f
-AUX liquidwar6-0.0.13_beta-paths.patch 1667 SHA256 07333310c21d2b765c20672b20e59f3ccb11b2d8a7f6099aea9e7d916ed858ef SHA512 d6c488c565da6f8a158748d8223a59af3e0211b682b493291c96e04266b316db8cf4f7b58362a5430279159bd3d584372ebdbd596241d68fde28f8d6fc841198 WHIRLPOOL 49114eec4954487653c4191a52e7283bf6658a224f17c6db05617a6a8ddbc615f4a9d074a601e12248234aed65e45764798901d05ca819f84d9b1320f4a0fdfc
-AUX liquidwar6-0.2.3551-ldconfig.patch 794 SHA256 be20dd8e88926b9effce4e6a3b89d0e6a97f632020f88c24c3e3e8fa0f16c89c SHA512 d22a67a1da9b9078a7678200ddebe494ecdf1c76318de36fcb9ab1f4eca710e3816baef2a58fdf22bed6702139e13224db2094533a4e6b502fb9eedb0d58d1e3 WHIRLPOOL f4ca9bf54ba8c25de0da245db0e3a5d6a0a4c49b1382f6a3cb319e741db8e099380b36e1f2f29a99d7cf75db44e4dbda27b8a08494cd4f92991c7053c3c52edc
-AUX liquidwar6-0.2.3551-paths.patch 954 SHA256 0fd3e61cda48669c1183540f2f283862510f4a082091ef99da444a0b53567450 SHA512 aeec6227e38ca46ecb52f48db3140aff24bd71035e8fc9244ba769d9b8e6a3a8c2f8eca8ffee49430f9eb00b1784b998e8da3757edbc9127fd7669d0a3b73bd3 WHIRLPOOL 8e277ed1597151e4cf1ffd9b17a23e5415a33f0feaa008c3c56181235bdd4e6539d675b11bcd07f33e93ba652c5de576b0ff92d99b4e67f2382256d21d8db9b6
 AUX liquidwar6-0.4.3681-check-headers.patch 3579 SHA256 fdbac895025ebdb044e0621fce892f92e0fb4de8ae122ec14b8a9efeb0870e3a SHA512 43429430fe1d447bd70a8b7a6b1da0023a9f17d6b96e2edd7079e199c25e8e28df9ffadbca6c94ee4fdb397022d89f0246cf4da3468255fd204ae4e51fe53e9f WHIRLPOOL caffdcf113616d4895fb560c2b0a8f816ca357136212dc7cc37dd22c1923e75bafa2c9107d27fa21f6b987cf444dfc04bb3b0e059f00b87774f50969044c803b
-DIST liquidwar6-0.0.13beta.tar.gz 25544158 SHA256 a27332c451460617e2833aaeaf81ed153a7270f87b1c322814c049b43e3f4eca SHA512 505067665fc48d5044f887a7a95a449569bb8c112f9ac975623d22ede8692afa6fc949b15395175a39395161616fedb0b429d737aa4d115e3b392d3e2b51eff6 WHIRLPOOL 341a4544a215a11322bbb478ace8a6844882340b1c8a3c0a0d6ab43b03766897e29a2d00dce14dd9a1f32b39a3178052526bb934789a4848170aa60264c769b6
-DIST liquidwar6-0.2.3551.tar.gz 26483549 SHA256 7f0dc9cba9fff4c2a2896108bda97fd055edef51e48779d2bb1fc268361692d9 SHA512 9ad976a6b2f2c31eada755f3d5740ca2f31ee91136ce52b57118eee607e65ec171d9cd60a84e6ffa7325e9d0a26c168c339f063007bcb707e365c955ed7a48dd WHIRLPOOL 26fe36cc87ce5efc022159a288b5e17bf9252688eedfb451071fe6702bdce621c35014752582cf8ad0798c60a589018855551271bd8f1cc9dab884468949cac5
+AUX liquidwar6-0.4.3681-ldconfig.patch 717 SHA256 4a3010fdc6a94e9704e3c648040f2660a23ccf939a963528ddbd742f5a703faf SHA512 8dfb058210de219c6f27564988ba92c4bcbae2e74b3c42636fccf3e8c039e1aae8df724bc59d40484dd40151eb46c168a2eba929af15f54ee029b5a600559c2b WHIRLPOOL 12aa0f626c3e8fcd1c0bba8940417dfd960e1b291cb632c35a282e43d7945dc3ca09c0094c9cc9d43fe1f5b14fd51060c4e8093ac9c59d619a4947f81f43ff7c
+AUX liquidwar6-0.4.3681-paths.patch 788 SHA256 05056f313766dc505849047575dcff9fe77b6e995befca27eaaa42997cde75d7 SHA512 6e89453c4c5ff08f99d41c1ab92ed6552c41b4f08eb09b2e7c5ca10147eeb02b000eb68bc1eb4b4b29f27e15ed7e7d380999c13a16804665a937e5facb67f365 WHIRLPOOL 62caadc7745e27e03651c7d1f88f598676ef1003da59520e4d7fd09ff1008068cea48401547595382fcf0e7697d1a44009cbbe8ceed59adc78b67bb1c652c86c
 DIST liquidwar6-0.4.3681.tar.gz 26531646 SHA256 942f5547199462fea521717b94517d6415d90573d948e94922f7b15271a4a8e0 SHA512 4154c8d3c2ceb128cf2d27a4682c89a30d3610f695b2e05f8d4e33c13fb54aaab3bb4a2b5c6dbcc43ff5d24991ea57a521716c94e15d8dd05dc384c22a37f52a WHIRLPOOL 4f502f572082c89469126eb97cfb181c28980783203f73b51a577c9a9e6cd28936f76c50892757320cb8dbee8b44319790a5ca7715d7cf096664043233fd5647
-DIST liquidwar6-extra-maps-0.0.13beta.tar.gz 16066532 SHA256 f6bab8b5746f02f50ef2800a94a86eedb6e9cbf919d60921e62a1f965511d2dd SHA512 0f3b742e498c3f2e8354fb53f057d0fed0af3b1edfef41a7688ce7871c229908b2c1ca2f06556a803e7ecb491a6592282ed6291a1b271263a9dc3e634d481fa2 WHIRLPOOL dd7b655dde9066a2d16072140f132e34d58d3fc444cd2f31355af5e335a84d95805f879dae2fc6f8c7624a409de7e31be4c3bd80695e5a1aa70f4cf9cfb87b02
-DIST liquidwar6-extra-maps-0.2.3551.tar.gz 16183550 SHA256 1acb398907d2c89e26f0f7baae11e88024968be52fa0c6534ce8305b32271f6b SHA512 da2bb6dae319a7a0b430467166395d5e433cca112cd867a93f02eee5472412831118a9e2a7657430c4c7296065d91df2264f69a41ae1f6b75807fa9be67d5338 WHIRLPOOL bd6aef458f3ee96be08f01c81bbe38d93ade67076daf34780d03a9ab342030cef072a84d48e3752ef5f67939d2cae658d93dc14d875c0204f234c6f549ca4b29
 DIST liquidwar6-extra-maps-0.4.3681.tar.gz 16191302 SHA256 32ffe94781aade93ca26919220b434a26dbde9260655bf6733f19d5df41abc65 SHA512 e767adc4402f803824145fd12f79eb2cbf9b34aea12065123a558dfb6704bd7ab1861b453e794f7a612d4fa75d0f6024ef410b2700eea08a279d6857b9dc2ba7 WHIRLPOOL d53b3e28b4a26aba780e35a825c1fa7f33ea00bf4884b44685a550cf6c04d0a2cf296dd29ecf5d7884ca91a8f560988dce7b4ae1c819a92bbaa5cc59900e154b
-EBUILD liquidwar6-0.0.13_beta.ebuild 2399 SHA256 a0cc444e36d44302b14d9e0d5593fabeba3f708335ce6d7e23996cf2f9104613 SHA512 ddc36605df479d740587ba393d7a4c10976838b8f135dc91f22958816dc8a3f99318d108e5b80ff78fe35659abd49fe725f5be36d9ab4084d3f963cd8eec8056 WHIRLPOOL 621ad7e50ac4f0cd8ecfc8059285a34f8154ae7cde1bc8b8e2ac3505a31aff30ca00c33759b9b0258212338c4cb9f2bf0a6ff9fae743f6f5e4686984ad6c7848
-EBUILD liquidwar6-0.2.3551.ebuild 2602 SHA256 813587ec07e513777c9c076dafc951d9e7be318cb7b58560e9f0b320ce47ad92 SHA512 1c4f6a1377310a8407c2fc4c3bbf0c8126e2ffb1f2ae5d6fe190d1bfb94d41f1fb91caa9062601792224a5aff76daef59b8f617189d421e536c614cf0e79ab97 WHIRLPOOL 975c8b8c53dd4674cd4ff32f34d3399c98da2ecc28434b9a61c8f464e067a64067ca7a4caf62fab477c435e1f9666500cc2ce3cf6e3bd8653c21f57804b065dc
-EBUILD liquidwar6-0.4.3681.ebuild 2749 SHA256 e197d626636a1c90130bb628e2fcd948a7a890c6630ec6cd1927b6afbd43819b SHA512 2db9ce31698a52797d2863d89e2e65541efc4d23d68cb0223b36ca033cf10e2f73cb670f83b4c303f8f566e06ae874ff06a6f0594fb39b6bd28911f3150ac8e6 WHIRLPOOL 6452d6481582baac5ea94f2a24ad30a8b1a06ca8cbe3920976b2f8a75b913ca8a7388aac68dfa219d3c3da1172b03293564853905960d9085671ac227d4c37d3
-MISC ChangeLog 1939 SHA256 a2ad6c07302fc8a9f8b03ad7198eb93396120f3174cad1c8410024a0520f3214 SHA512 2fa7168bef2f24c7d78939ddea2d996acf3909d8ba7114bc6a17a93e01b798f104be2f703724f9b22cfea94272f6c6f97adf4fce07943702a965f1505582954b WHIRLPOOL 7263add745d56b2a5adf94e40a4413234f4047fbdad11394ac4b6a1f63af79a046fbe7aba331a782a05dcf0545b48787e5048144a7c330c20c1c721a9cf4cc85
+EBUILD liquidwar6-0.4.3681.ebuild 2736 SHA256 325e262c2d9a10e95950196f98f78c9971763cd22681dad0e3a4cffda19955e0 SHA512 338258a7c4c8d5b1c704bfec23a6c3f62070a5406b4633dc3825ff00c0f478ca39917b93871b9845fef4f227e2fe1f28136a77c40c77a6d9c806f32a944be852 WHIRLPOOL c863bb589acb39cf66e956bb1749162f70cb6085c507e3e8af636d5b514c33d6f3be4a9a353a43deb8df0fa5a126fd1f581e3fb94493712493c87cd928b7ee8c
+MISC ChangeLog 2431 SHA256 aba38e8ed310ae2933aa7a6450d9218a70c961bc8be12126ea6d20a6ef79fa93 SHA512 4fdfec89afab91d5fd133282931368ac6966b208c7048201f7cae046f090fd22219b4c7e592326ffa093aee1a32134e49b4c877dc05de74333be11e65b85d619 WHIRLPOOL 71be7df710179a4c9161d3dc4edf7fffc72b562bf73715fdfe0c6453a75317a45f6c2ff948d170033e9fcc7bec939f2fb7e59545623564508bd257b2217ec0e0
 MISC metadata.xml 1427 SHA256 ebfe8659ceccaf3d6af6cbe242635739c55f81f74d265e8ce448ba88b19b90b6 SHA512 89ca97dca722f120018da5a37da6f3f98c77939dc7ad2b80fbc47f76ffcf82156a8616c09fb8ada2aaee1cc9f8c5daa926a30cdfde537a2588651dd5820d5131 WHIRLPOOL e5126dce5bd999c4e7a07ddf927a293438637c3a51311629245c760fd298ce94e3b8eb58d6c5e98e08209c1a034afdc592253f2e16a68ddaea73b5f688af5fc9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCABmBQJUdQ8NXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgPzsQALIdO0Y3bMT2GCCCoYEJn1hx
-HQssBYTwme+UpixDv1VnaEnZe5QniciOEi2+HNVaTOhHDy0rwc5CFOBiY7mM4iXW
-SYS/zqgDYwHMUqF9AwEbza1JogHYHoChY32lW/l1OP4gvqXBe94Noy7X/ZgPfz2x
-cKp94TVNuYg4fGspIiwNxBmgBzv/vU+0rGEllii4OCk/51OW93n7r7tXsMWvghxH
-4pMgesS8HRJ+XbrOp4fVqvYiaoVsT9+l8qgLiNml//q6eqFJLRpcPxh7nWnRGT0H
-icUtUXs0eJfpbvmontRFFMRGaRA9yvUow3gqRACUXmVaGmNCht5cMGK8bjfUE1vD
-jUh9BMRr1C0i/mYjINEvQ52doBeiIy6NAwHwCCDHi/V21/qmsa2SMDRCjnENZyng
-4Cg0Jz++Bb7JgPKokbeXSekEbTFV+BypU0rpP5l43TzJTZjST50CP6uGKNssBL06
-BDWOt1TZ0Lo/C7u1tNAWkZFOLGIOt40WC1oM6B7u7HTP0lxzGih7CloE113b+gou
-xUhzRO3SefQcsijG/iOdJW3RGsoQD3yrkIgeoZpmUhMP+gojXI2YV6km3A3d6+3I
-BXb+XzcKHbqIlTUYMo5vLlYdcXLT5zzqGTs5V7QVPaFXRKeBEvN/CiG0haPwKh6s
-2NJKTzIHUwuy508AJguj
-=Pba7
------END PGP SIGNATURE-----
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//' \