Fix compile error, bug #405591 by Sorath.

Package-Manager: portage-2.1.10.44/cvs/Linux i686

4 files changed, 47 insertions, 12 deletions

diff --git a/media-plugins/gimp-lqr/ChangeLog b/media-plugins/gimp-lqr/ChangeLog
index 9e5c05c35dc8..0a4f905645e1 100644
--- a/media-plugins/gimp-lqr/ChangeLog
+++ b/media-plugins/gimp-lqr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/gimp-lqr
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-lqr/ChangeLog,v 1.4 2011/11/28 11:57:37 phajdan.jr Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-lqr/ChangeLog,v 1.5 2012/02/24 18:39:40 phajdan.jr Exp $
+
+  24 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> gimp-lqr-0.7.1.ebuild,
+  +files/gimp-lqr-no-deprecated.patch:
+  Fix compile error, bug #405591 by Sorath.
 
   28 Nov 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> gimp-lqr-0.7.1.ebuild:
   x86 stable wrt bug #390269
diff --git a/media-plugins/gimp-lqr/Manifest b/media-plugins/gimp-lqr/Manifest
index 301852db4a05..7ab117986d7d 100644
--- a/media-plugins/gimp-lqr/Manifest
+++ b/media-plugins/gimp-lqr/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX gimp-lqr-no-deprecated.patch 578 RMD160 8b2f659ad08dd31fc8f1eda3fd19bf309fd6ce92 SHA1 31fd2368c15b2571d358178e86045af462fbb320 SHA256 7607bf352aa28a36ff942a6fd0a35c447d6b7a8a58003b90fd9263b60bfedae5
 DIST gimp-lqr-plugin-0.7.1.tar.bz2 783423 RMD160 d445204a295e4f9d5a5fc0f5fb7081c60bfc8a43 SHA1 cc7ae00ae4ba144e3f5bab6cc62f43e12cdee3f4 SHA256 6298183e31d992e789592e754069ae8176af192fb5c78a36d12b77d6aa119e0e
-EBUILD gimp-lqr-0.7.1.ebuild 705 RMD160 0f35e5c162ce4cb8908d317846340737eafe22d2 SHA1 0f438ce2a0ff5e69cc5765e88b3f9d676c86ffaa SHA256 8a5aa5164dbe78215997f2b46f3ce392161e849a413411fa84527b39319684ad
-MISC ChangeLog 1134 RMD160 134ff026fccc9fb15414a74722b8db43cf6ac41a SHA1 bf561bb4a548785653367695915fdaaff6aae192 SHA256 0cf2e316cd86d0eedc25b1e70f6f1c2e1fede2345ee09d5ad419b0d23e2ab060
+EBUILD gimp-lqr-0.7.1.ebuild 806 RMD160 6e034bbbacac5acf60e896d6ac697cfb78f3eb38 SHA1 f7d4a28ee366857add1ef9e013358baf651d6a9e SHA256 611bc9df912188b58f278b27c7da64cb678eb00877ccd710f695734a3fc1ec37
+MISC ChangeLog 1296 RMD160 1ab1c8d7aeb226d8883eb7a5e013b782a10e0e3d SHA1 83ababbe79ca163f2308a1e8b22471f8bb79d952 SHA256 681965e5ba176ba07233654f5e3d48eb9c6b90d5d9e3c355fcebbcf7ff552973
 MISC metadata.xml 238 RMD160 7b2f4e44501d009fd9989fce9d632a7ebb1086e2 SHA1 1a0fbc7c1fa7486ec4660714cb96e9c86a22013a SHA256 f5bfe7b3171e6a50ad6d8fb7da8ae5c20f228d93ecaaef9beea6a72d34be799a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk7TdzcACgkQuUQtlDBCeQJ75ACfQv2XUwA707Dx8sezoBiHyvAS
-D7MAn0B4m7M6/2mqWMhEyieTzSIDX3fh
-=MQwP
+iEYEAREKAAYFAk9H2XUACgkQuUQtlDBCeQI5fwCfWRlkTG+jPUBBmMIxUXDxkceK
+Q7oAnjD93mdQ3ldf1TtsAkRY1H2RBNWz
+=OpvX
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gimp-lqr/files/gimp-lqr-no-deprecated.patch b/media-plugins/gimp-lqr/files/gimp-lqr-no-deprecated.patch
new file mode 100644
index 000000000000..b309df4d6090
--- /dev/null
+++ b/media-plugins/gimp-lqr/files/gimp-lqr-no-deprecated.patch
@@ -0,0 +1,22 @@
+--- configure.ac.orig	2012-02-24 19:32:04.000000000 +0100
++++ configure.ac	2012-02-24 19:32:20.000000000 +0100
+@@ -116,9 +116,6 @@
+ fi
+ AC_MSG_RESULT($have_gtk_2_12)
+ 
+-if test "x$have_gtk_2_7" != "xyes"; then
+-  CPPFLAGS="$CPPFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+-fi
+ 
+ 
+ AC_MSG_CHECKING([if GIMP is version 2.4.0 or newer])
+@@ -129,9 +126,6 @@
+ fi
+ AC_MSG_RESULT($have_gimp_2_4)
+ 
+-if test "x$have_gimp_2_4" != "xyes"; then
+-  CPPFLAGS="$CPPFLAGS -DGIMP_DISABLE_DEPRECATED"
+-fi
+ 
+ AC_MSG_CHECKING([if we are on Win32])
+ AC_LANG([C])
diff --git a/media-plugins/gimp-lqr/gimp-lqr-0.7.1.ebuild b/media-plugins/gimp-lqr/gimp-lqr-0.7.1.ebuild
index b8326964f761..2521cb1d3b81 100644
--- a/media-plugins/gimp-lqr/gimp-lqr-0.7.1.ebuild
+++ b/media-plugins/gimp-lqr/gimp-lqr-0.7.1.ebuild
@@ -1,6 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-lqr/gimp-lqr-0.7.1.ebuild,v 1.4 2011/11/28 11:57:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-lqr/gimp-lqr-0.7.1.ebuild,v 1.5 2012/02/24 18:39:40 phajdan.jr Exp $
+
+EAPI="4"
+
+inherit autotools eutils
 
 MY_P="${PN}-plugin-${PV}"
 
@@ -19,8 +23,12 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-src_install() {
-	emake DESTDIR="${D}" install || die
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-no-deprecated.patch"
+	eautoreconf
+}
 
-	dodoc AUTHORS BUGS ChangeLog NEWS README TODO || die
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
 }