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

(Portage version: 2.2.10/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 4868F14D)

4 files changed, 22 insertions, 17 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/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