Use -latex_hacks.patch also with =dev-texlive/texlive-latex-2012* wrt #517474 by Torsten Kaiser

Package-Manager: portage-2.2.10/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x4868F14D

5 files changed, 33 insertions, 34 deletions

diff --git a/media-libs/libcaca/ChangeLog b/media-libs/libcaca/ChangeLog
index 9ba9695a9900..8b69ff314d6d 100644
--- a/media-libs/libcaca/ChangeLog
+++ b/media-libs/libcaca/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libcaca
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.119 2014/07/28 13:45:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.120 2014/08/01 19:42:47 ssuominen Exp $
+
+  01 Aug 2014; Samuli Suominen <ssuominen@gentoo.org>
+  libcaca-0.99_beta18-r2.ebuild:
+  Use -latex_hacks.patch also with =dev-texlive/texlive-latex-2012* wrt #517474
+  by Torsten Kaiser
 
   28 Jul 2014; Agostino Sarubbo <ago@gentoo.org> libcaca-0.99_beta18-r2.ebuild:
   Stable for ppc, wrt bug #512012
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index d711cd4531ec..7855461a316a 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -1,29 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libcaca-0.99_beta18-fix-tests.patch 2222 SHA256 7bc472675e640633ff83cd104ede5caada5307064c021e692686f6b0d296df06 SHA512 bd007e9cdc73aec6cd0df3d66fea60cfe63f51a274ecabea52d7658114f8155fc5d0b2888896e39813ff856423064265fa50733312ce3988add5f096866bd60a WHIRLPOOL 380d486ec4ecd5a96195e28f0c418ccb363f6cfebc580c3937f9e2b179f9f2401ced8f9ab6cfa771262a7f0719f3a690b4dbbbcc1f4c33acd9616cb95cfd234d
-AUX libcaca-0.99_beta18-latex_hacks.patch 720 SHA256 1320f0a27bd6338882e36b18b024022464488b20a802680aa7150880ca24818a SHA512 1b9a475926c966c4cc64b76ae38550ccdddc1001fbbf722bbd32e450c88ec6be9e1fbe88818f71d8d0a1ea3c213d487ec3b26d0e52760bad54f3cccca3160f0b WHIRLPOOL 916ed33a2ce7b7bac3a9b32dc2d138a0ca6464d00242eba1484671b807e4124f7aad19c6ac169ad0be9a42906b75347a818a284486814b083562744966102ae1
+AUX libcaca-0.99_beta18-fix-tests.patch 1874 SHA256 4526b44c79e194d61fbb86957bdb3b4f6453109a396bb969df675e9a359b8905 SHA512 1a10f0c4b006684471505b35bbe0369e6928c2dfc01e9d8c8ed706d9dc6890035c1fbf509e4a02c6030f0af382a982616c83128b92a2b5574a99e0963ae6b20f WHIRLPOOL b5c8e61bf66d56829ce7a9cdfa3ffb5e92967f2da446c1f0454815406b7e195d13363663a3d5a2ac7145dd6c07b9e360855a8c1df5a118eedad8c37250515434
+AUX libcaca-0.99_beta18-latex_hacks.patch 641 SHA256 859186308ef3ceee830f6d37200c76f443523f02a546e0976063bfa742bd5f6c SHA512 66d878696ae237310cea20e3bd5802afce6fa94f66b07c1660456d17a33218a93e3aea6bcaf99bfada67bef6857089559aa48068a1761e7fe439a81d82a1ab6b WHIRLPOOL e19d7f278f57226d2a6a23a4cabee84db3557acadbc28c9736ededb96e3cbe0d73cf418017974aa8b76236207d854ec84260a3b383dec38d4c99d00be81ff937
 DIST libcaca-0.99.beta17.tar.gz 1110516 SHA256 6355ae9e3961e983ef66057a232d25f1fba2e7fa615d7591aba011d78764f1d6 SHA512 1d08a45a742cbda2c80810e753b49588cb9073ef545a1d47537745c4e62dc79748a25907903ffee58676d9aa5b75c5e0658666429cf028e10c09157d418c8d19 WHIRLPOOL bb241f90a36e2b73e2b50dcf15260153385ac2521bbe43a120c55ce5f2560ab9078ca40cf90a799646e6736461a876e33203abdd39f4ab794e6b509f8622b2d4
 DIST libcaca-0.99.beta18.tar.gz 1168552 SHA256 77ea06633f4a6022dccd4f76c1823e167a40cb05308fc1c7ea0fa1f80f6c33a1 SHA512 b2a8264ec36b74a01ff415a1fd7cb1806c76e28795b73607d4f8fa5ed5cc776b215f2817f45f06c672688f010622ee5c5e2f9dc4d0c43417dedbff545d575ca5 WHIRLPOOL 3e6404f0d16ca5718022a919c1568b0e8afaa40d58ca4a1e3271c437bebd3cde40ac63f45c6bbfea00a4936a673c24bdd21ecc0070f4814464d787dab33c183b
 EBUILD libcaca-0.99_beta17.ebuild 2650 SHA256 b2874ad822ccab2f25af40b987f18bbf88b16685025afa92923848ca242b87dd SHA512 1f1cf2887ab542cbf9590b7e2f869fbf4f5c8b7723e2c357b8c29c77be385a2553d02f4417608885f1b840bb2c1845a0158a46863fe3698105e5f37fe6daefde WHIRLPOOL 64f7b9fda46b5e8f4c1e425aa4e357557b50a359d1f169fe024cf8315c9eea93d2e31636fdbf8330ac35b72fae42202e59af4cc6527f68935d7218889e1ccf3e
 EBUILD libcaca-0.99_beta18-r1.ebuild 3238 SHA256 ab62162f3ee1f5ac083804a5711eb50849c928b09759d554c0b2af4ed5377784 SHA512 9591b98eea13391e3654c7e986f405ecaf39230e33761f0ca3efe4d953adda651f0aedaaa24a1e246d2945495912ad0f91d99a9323ca25a5a91b42d61987dd3a WHIRLPOOL 1ff3d383d9d91fa0e5f1b3d8d3a1ca40ec5f173fa2f7cf82278a2cdb8415e07f1c162556a971b019ec5bb2c258473a6d06e9b5e71f580b0f291699c1dbe34a74
-EBUILD libcaca-0.99_beta18-r2.ebuild 3839 SHA256 601eb2a96ee9baf7727f01651ac5eed9446ddee2fef50f4458c09ddb82e88aed SHA512 ffc7beb2ebf5b8354a7153a1dd8dc0630b143ff183150308efa49b3bd29a4aca41905a67f1d72ac69d99c03a0f15cf51d0f0eaceba7acf1ca70aaba14af74064 WHIRLPOOL 8ca9a89236fb9e1dced8d8aac3b4ec0a23dbc7ceeb2dde8cd9efb62e7ab84c6d930b294edbf8f095487d0722908009607ba6dc88cd10cbc089dd546531581abc
-MISC ChangeLog 17670 SHA256 6e4eff1354fe5d4f0d8f8e338e0920ac2f78dda7426bad7c5a3dca9712d9762c SHA512 601bb6c06f4397913272dbf03d96bbbfcaefde9a8f81508ef4838536401fef325d236adf6154c59ca73da707d10e6003e878f987fbe6d20aa3488f2aeb494ee0 WHIRLPOOL 75c178a005d4d9f405d1f1f82fe2072ab8cbf603da33277f0aa73e17e97c66722476dcc40526259b9fa1599fa53b4e85ab8ce2d7764751d7ff53556112f095ad
+EBUILD libcaca-0.99_beta18-r2.ebuild 3899 SHA256 e05cb69a84fdceb5227dc3b979a1e899f03bcc42d55b3094d644dbfdd3902598 SHA512 95e997079cbd6105f87d14bd82bad658e692a03d9b68d237246e98f0dbc3be0dd6ba8dd47c903d8e4930a24db95498b76c9e52a536dafed7b69b68ef6655420e WHIRLPOOL 3401ba0012509098efc678deeae2cad18943cfd57a8e011eef8180afd3d608031b318b89d0ad4cb77b9ba6341696f1a37ad4a3e442d5216b3d0087a6c4f6f9f7
+MISC ChangeLog 17864 SHA256 4325905db38b747e5c3790835016edbc55f28fabfdb0120793ded90979955091 SHA512 64b70afe4cc5f619db6b0b6d668b704a8cf7f0e23462226a3b7e741e4fd4af96c23d0744866b9c17cd23fa413f51b66bfa3216ec6bfe91e36ae715e999669b96 WHIRLPOOL 14b7e5d0756035989f7aa87edfaa5856807f70a91aa267abad0496d1f0ca8bf1c76210d6875966a977c8a9f9e1e9741bf6d1efc445c3783eba68b766e851b278
 MISC metadata.xml 223 SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 SHA512 cacba929b8688a7270637f34d348216fdeb89e725cdee4b40e5577ca3f626c5f72e73c1c125605a284506aff47265f41e3fedaa76ed4074c540fc1f200e6d494 WHIRLPOOL dcd04d57abcfe2704036097ed68500917f74b7024b46580e9054e1c933d55678992c350fe07ff0efd590b9345fbcdd81665b8ce546f786dd31f5a0f4eb654da3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT1lQCAAoJELp701BxlEWfe44P/3c9IDtZitWT4bT8gmY509h8
-OwVfCkLSDoJjkvBI5ry22f/fnCksNpwsPvQRoxZgkw+TvpfUKocoasRSyUdMK7Hg
-2a6fvsevzLYb/4sETyb7fhdPk2VfLmc5qyMSUjm1bcPQNEdqeXp4iKElQCK9uyOk
-FtfD3pAJ/cfitS9kI6rgh7qwq/CFpCYLmZ8BrmfIi20GHnOe0uG/IjNmN94w/EQO
-6jhJ+qIXSnLKnW4xK1QBGfkRol6SnUYb6vz8mzlyAzmZO8W0OVEXYrUX7CfWVZTV
-p8/pOvD2KL01+HDYVX3/AbDV4Xw6sOpVMUzVYJlQSym987bBbx0BJ4V/LiMUfcwi
-dx6JMh6F+c67+YP5tIEWXtpRN1sQPk2JT159D8XCHwwFEL9NphP+odmRLiY5fy3m
-pMbHLR8Ya0cUsz/4fdUSS+lK0ev8E2rSWLqBPcMsMtw8Ufs02Ji9bWToQ9dRGGm1
-35kXblV6synO0D+8QYIq97FmeLFJCWVva61XN6/GPnvYKLdpbN7WKMVSts0hTEGL
-HPwBZfxeb3Q6M16wAEERBg1XmkNpasDXuoGA5myMCEJWG5x67OAOiukwAws8jLRA
-iOJTRhdOaFNmPH9rJQxoD3ScD7mH57XPIdiYqs5pUlXCtBh4G01kz7E7hG3JFKEC
-et1wNfYKsOM0POZ5q9Gn
-=G38B
+iQEcBAEBCAAGBQJT2+2sAAoJEEdUh39IaPFNWeoH/jNB539Ze+K0QUFY+WneIIDI
+JhvkQJseDtSfDliwCGS1hoN8o68oa125Sh1iLxegtG0JoBh5OZl2yz6bsvzFPEJa
+lH4fCOMMz84h6pE3pWx8+Gp+SUADCiMqDA3IwfvxJsjxtDPD82iBJ0H5nos2dxHn
+6hywPcHUR3GyoP/KDb9XXUFK7xCOMy2+5jt3pZ8nK/W2wtEEeTUs5aPttZ3y4VH2
+pql1sQyH3Dy1Tv33HtIBvORb4cUaX1ooP+zjpp41xy/2YTpRP8dk+XTVXZgYc8SJ
+WxqamQqsnsYtOtuBhUKzbKwO/p1oXtLTXYW+bLPxi0mZB7dvs0OMHXytuCSVJ9g=
+=0J5E
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libcaca/files/libcaca-0.99_beta18-fix-tests.patch b/media-libs/libcaca/files/libcaca-0.99_beta18-fix-tests.patch
index c88af4654a44..f9ff8090c215 100644
--- a/media-libs/libcaca/files/libcaca-0.99_beta18-fix-tests.patch
+++ b/media-libs/libcaca/files/libcaca-0.99_beta18-fix-tests.patch
@@ -1,13 +1,13 @@
---- libcaca-0.99.beta18/test/Makefile.am	2014-01-08 15:28:40.567140658 -0500
-+++ libcaca-0.99.beta18.new/test/Makefile.am	2014-01-08 15:24:51.295134240 -0500
+--- test/Makefile.am
++++ test/Makefile.am
 @@ -1,3 +1,5 @@
 +AM_TESTS_ENVIRONMENT = \
 +	top_srcdir="$(top_srcdir)"
  
  AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I../caca
  
---- libcaca-0.99.beta18/test/check-copyright	2010-02-15 18:36:37.000000000 -0500
-+++ libcaca-0.99.beta18.new/test/check-copyright	2014-01-08 15:18:27.514123495 -0500
+--- test/check-copyright
++++ test/check-copyright
 @@ -3,10 +3,11 @@
  #
  # Check that the copyright information is valid
@@ -30,8 +30,8 @@
        echo "error: $dir/$x lacks proper copyright information"
        nfails=$(($nfails + 1))
      elif [ -d ../.git ]; then
---- libcaca-0.99.beta18/test/check-source	2012-04-06 20:46:08.000000000 +0200
-+++ libcaca-0.99.beta18-upd/test/check-source	2014-01-08 21:58:05.015389138 +0100
+--- test/check-source
++++ test/check-source
 @@ -3,6 +3,7 @@
  #
  # Check that we have no tabs or trailing spaces in the source code
diff --git a/media-libs/libcaca/files/libcaca-0.99_beta18-latex_hacks.patch b/media-libs/libcaca/files/libcaca-0.99_beta18-latex_hacks.patch
index 70cb34f88bf5..060822e6dcc7 100644
--- a/media-libs/libcaca/files/libcaca-0.99_beta18-latex_hacks.patch
+++ b/media-libs/libcaca/files/libcaca-0.99_beta18-latex_hacks.patch
@@ -1,10 +1,8 @@
-Hack it a bit differently so that it works with texlive 2013.
-https://bugs.gentoo.org/show_bug.cgi?id=480862
+Hack it a bit differently so that it works with texlive 2013, see http://bugs.gentoo.org/480862
+Turns out this patch is required also for texlive 2012, see http://bugs.gentoo.org/517474
 
-Index: libcaca-0.99.beta18/doc/Makefile.am
-===================================================================
---- libcaca-0.99.beta18.orig/doc/Makefile.am
-+++ libcaca-0.99.beta18/doc/Makefile.am
+--- doc/Makefile.am
++++ doc/Makefile.am
 @@ -29,7 +29,7 @@ if BUILD_DOCUMENTATION
  if USE_LATEX
  	rm -f latex/libcaca.tex latex/libcaca.pdf
diff --git a/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild b/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild
index 3a60870d1206..d86180812bc3 100644
--- a/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild,v 1.8 2014/07/28 13:45:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild,v 1.9 2014/08/01 19:42:47 ssuominen Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 inherit autotools eutils flag-o-matic mono multilib java-pkg-opt-2 python-single-r1 multilib-minimal
 
 MY_P=${P/_/.}
@@ -73,10 +73,12 @@ src_prepare() {
 		append-cflags -DX_DISPLAY_MISSING
 	fi
 
-	has_version '>=dev-texlive/texlive-latex-2013' && epatch "${FILESDIR}/${P}-latex_hacks.patch"
+	# Removed 'has_version '>=dev-texlive/texlive-latex-2013' &&' that prefixed this
+	# patch before wrt #517474
+	epatch "${FILESDIR}"/${P}-latex_hacks.patch
 
 	# fix out of source tests
-	epatch "${FILESDIR}/${P}-fix-tests.patch"
+	epatch "${FILESDIR}"/${P}-fix-tests.patch
 
 	eautoreconf