Don't apply a patch to use /usr/include/lcms path, just append a -I flag if the file is there (nothing needed for newer version of media-libs/lcms that don't install in /lcms path).

Package-Manager: portage-2.0.51.22

4 files changed, 20 insertions, 114 deletions

diff --git a/media-video/cinepaint/ChangeLog b/media-video/cinepaint/ChangeLog
index b1c97ae6087e..b6ea3f7095fa 100644
--- a/media-video/cinepaint/ChangeLog
+++ b/media-video/cinepaint/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/cinepaint
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinepaint/ChangeLog,v 1.7 2005/04/19 09:03:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinepaint/ChangeLog,v 1.8 2005/08/07 12:51:44 flameeyes Exp $
+
+  07 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/cinepaint-lcms.patch, cinepaint-0.19.0.ebuild:
+  Don't apply a patch to use /usr/include/lcms path, just append a -I flag if
+  the file is there (nothing needed for newer version of media-libs/lcms that
+  don't install in /lcms path).
 
   19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove retired developer from metadata.xml.
diff --git a/media-video/cinepaint/Manifest b/media-video/cinepaint/Manifest
index b09dfdae86a9..867a42a0d783 100644
--- a/media-video/cinepaint/Manifest
+++ b/media-video/cinepaint/Manifest
@@ -1,20 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f192f0c9e6f5ed51bd47ad9533b95d1c ChangeLog 1430
-MD5 0e37bb9998012e8213845f1848f92d7f cinepaint-0.18.3.ebuild 985
-MD5 71b8b05f57ca044d8b9a370be61b27a4 cinepaint-0.19.0.ebuild 1116
-MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 8668471c7c362e921cb0d0afe70ca260 ChangeLog 1731
 MD5 1ee52edbe3665f912c2735fc43aa7448 cinepaint-0.18.ebuild 735
-MD5 856e66a70aa9fce7961a6ec541b56300 files/cinepaint-lcms.patch 3192
+MD5 308e24373ec84654f403c32bae7b2681 cinepaint-0.19.0.ebuild 1024
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 0e37bb9998012e8213845f1848f92d7f cinepaint-0.18.3.ebuild 985
 MD5 b599a2e8ee54c88ac8fd777a115ee471 files/digest-cinepaint-0.19.0 69
 MD5 18b54df1c9a511a226297daf13dccaec files/digest-cinepaint-0.18 67
-MD5 0f99a4352d9c27f40fe6b07cea9d759d files/digest-cinepaint-0.18.3 69
 MD5 732e3bb45a2f1945a5c3217a87c53a50 files/cinepaint-0.18.3-gcc34.patch 1476
+MD5 0f99a4352d9c27f40fe6b07cea9d759d files/digest-cinepaint-0.18.3 69
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFCZMl9Kf2g/qXtneoRAhnwAJ9x93FdmhfEiweE2qHEeNh7CItRPQCeN8AQ
-+MrL/TMlYBM25H/Xne5F/fU=
-=dFWR
+iD8DBQFC9gNLj5H05b2HAEkRArNUAKCmDdp8uKPCwd1+WDdHspDB9eyaGQCZAZtF
+epISFTp8yqPSga9GESmB+UA=
+=J0dn
 -----END PGP SIGNATURE-----
diff --git a/media-video/cinepaint/cinepaint-0.19.0.ebuild b/media-video/cinepaint/cinepaint-0.19.0.ebuild
index c0ebff45150d..b49e4b673db4 100644
--- a/media-video/cinepaint/cinepaint-0.19.0.ebuild
+++ b/media-video/cinepaint/cinepaint-0.19.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinepaint/cinepaint-0.19.0.ebuild,v 1.1 2005/03/18 20:06:07 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinepaint/cinepaint-0.19.0.ebuild,v 1.2 2005/08/07 12:51:44 flameeyes Exp $
 
 inherit eutils versionator
 
@@ -21,17 +21,10 @@ DEPEND="=x11-libs/gtk+-1*
 	media-libs/tiff
 	media-libs/jpeg"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# lcms is <lcms/lcms.h> not <lcms.h>
-	# fix that in configure detection
-	# and in source
-	epatch ${FILESDIR}/${PN}-lcms.patch
-}
-
 src_compile(){
+	[[ -f /usr/include/lcms/lcms.h ]] && \
+		append-flags -I/usr/include/lcms
+	
 	econf --with-openexr-prefix=/usr || die "econf failed"
 	emake || die "emake failed"
 }
diff --git a/media-video/cinepaint/files/cinepaint-lcms.patch b/media-video/cinepaint/files/cinepaint-lcms.patch
deleted file mode 100644
index bb3ee314b755..000000000000
--- a/media-video/cinepaint/files/cinepaint-lcms.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -ur cinepaint-0.19-0_old/app/cms.h cinepaint-0.19-0/app/cms.h
---- cinepaint-0.19-0_old/app/cms.h	2004-11-23 20:58:15.000000000 +0900
-+++ cinepaint-0.19-0/app/cms.h	2005-03-19 03:48:07.864524744 +0900
-@@ -20,7 +20,7 @@
- #ifndef __CMS_H__
- #define __CMS_H__
- 
--#include <lcms.h>
-+#include <lcms/lcms.h>
- #include <gtk/gtk.h>
- 
- #include "canvas.h"
-diff -ur cinepaint-0.19-0_old/app/depth/commands.c cinepaint-0.19-0/app/depth/commands.c
---- cinepaint-0.19-0_old/app/depth/commands.c	2004-12-04 05:25:34.000000000 +0900
-+++ cinepaint-0.19-0/app/depth/commands.c	2005-03-19 03:48:40.364583984 +0900
-@@ -16,7 +16,7 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
- 
--#include <lcms.h>
-+#include <lcms/lcms.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-diff -ur cinepaint-0.19-0_old/app/look_profile.c cinepaint-0.19-0/app/look_profile.c
---- cinepaint-0.19-0_old/app/look_profile.c	2004-11-23 20:58:14.000000000 +0900
-+++ cinepaint-0.19-0/app/look_profile.c	2005-03-19 03:48:23.599132720 +0900
-@@ -1,5 +1,5 @@
- #include <gtk/gtk.h>
--#include <lcms.h>
-+#include <lcms/lcms.h>
- 
- #include "../lib/version.h"
- #include "actionarea.h"
-cinepaint-0.19-0だけに発見: cinepaint-configure.patch
-diff -ur cinepaint-0.19-0_old/configure cinepaint-0.19-0/configure
---- cinepaint-0.19-0_old/configure	2005-01-02 03:40:51.000000000 +0900
-+++ cinepaint-0.19-0/configure	2005-03-19 03:44:25.962259016 +0900
-@@ -21898,7 +21898,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--#include <lcms.h>
-+#include <lcms/lcms.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -21941,7 +21941,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <lcms.h>
-+#include <lcms/lcms.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-cinepaint-0.19-0だけに発見: libtool
-diff -ur cinepaint-0.19-0_old/plug-ins/tiff/info.c cinepaint-0.19-0/plug-ins/tiff/info.c
---- cinepaint-0.19-0_old/plug-ins/tiff/info.c	2004-12-31 20:58:29.000000000 +0900
-+++ cinepaint-0.19-0/plug-ins/tiff/info.c	2005-03-19 03:49:23.415039320 +0900
-@@ -37,7 +37,7 @@
- #include "tiff_plug_in.h"
- #include "info.h"
- 
--#include <lcms.h>
-+#include <lcms/lcms.h>
- 
- #ifndef DEBUG
-  /*#define DEBUG*/
-diff -ur cinepaint-0.19-0_old/plug-ins/tiff/tiff_plug_in.h cinepaint-0.19-0/plug-ins/tiff/tiff_plug_in.h
---- cinepaint-0.19-0_old/plug-ins/tiff/tiff_plug_in.h	2004-11-23 21:17:14.000000000 +0900
-+++ cinepaint-0.19-0/plug-ins/tiff/tiff_plug_in.h	2005-03-19 03:49:37.939831216 +0900
-@@ -79,7 +79,7 @@
-     #include <gtk/gtk.h>
-   #endif
- #endif
--#include <lcms.h>
-+#include <lcms/lcms.h>
- #if GIMP_MAJOR_VERSION == 0 && GIMP_MINOR_VERSION == 15
-   #include "libgimp/gimpcms.h"
- #endif
---- cinepaint-0.19-0_old/plug-ins/jpeg/jpeg.c	2005-03-19 04:01:43.243568288 +0900
-+++ cinepaint-0.19-0/plug-ins/jpeg/jpeg.c	2005-03-19 04:02:19.068122128 +0900
-@@ -33,7 +33,7 @@
- #include "lib/plugin_main.h"
- 
- #include <stdio.h>
--#include "lcms.h"
-+#include <lcms/lcms.h>
- #include "iccjpeg.h"
- 
-