Fix for bug 298113, Prefix support

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 126 insertions, 5 deletions

diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog
index 9b7632281333..98a7549d1fd4 100644
--- a/dev-tcltk/tkimg/ChangeLog
+++ b/dev-tcltk/tkimg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tkimg
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.11 2009/12/07 19:51:39 bicatali Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.12 2010/04/01 19:58:54 jlec Exp $
+
+*tkimg-1.3.20081202-r1 (01 Apr 2010)
+
+  01 Apr 2010; Justin Lecher <jlec@gentoo.org> tkimg-1.3.20081202.ebuild,
+  +tkimg-1.3.20081202-r1.ebuild, +files/tkimg-1.3.20081202-prefix.patch:
+  Fix for bug 298113, Prefix support
 
   07 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org> -tkimg-1.3.ebuild,
   -files/tkimg-1.3-m4.patch, tkimg-1.3.20081202.ebuild,
diff --git a/dev-tcltk/tkimg/files/tkimg-1.3.20081202-prefix.patch b/dev-tcltk/tkimg/files/tkimg-1.3.20081202-prefix.patch
new file mode 100644
index 000000000000..aa9cf460e578
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.3.20081202-prefix.patch
@@ -0,0 +1,56 @@
+diff --git a/libjpeg/tcl/jpegtclDecls.h b/libjpeg/tcl/jpegtclDecls.h
+index 49aa75f..2a22ce4 100644
+--- a/libjpeg/tcl/jpegtclDecls.h
++++ b/libjpeg/tcl/jpegtclDecls.h
+@@ -20,8 +20,8 @@
+ #undef EXTERN
+ 
+ #include "jpegtclDeclsMask.h"
+-#include </usr/include/jpeglib.h>
+-#include </usr/include/jerror.h>
++#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/jpeglib.h>
++#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/jerror.h>
+ #include "jpegtclDeclsUnmask.h"
+ 
+ /*
+diff --git a/libpng/tcl/pngtclDecls.h b/libpng/tcl/pngtclDecls.h
+index a50bbc3..06ed339 100644
+--- a/libpng/tcl/pngtclDecls.h
++++ b/libpng/tcl/pngtclDecls.h
+@@ -16,7 +16,7 @@
+ 
+ #include <tcl.h>
+ #include <pngtclDeclsMask.h>
+-#include </usr/include/libpng12/png.h>
++#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/libpng12/png.h>
+ #include <pngtclDeclsUnmask.h>
+ 
+ /* !BEGIN!: Do not edit below this line. */
+diff --git a/libtiff/tcl/tifftclDecls.h b/libtiff/tcl/tifftclDecls.h
+index 0e85387..a158604 100644
+--- a/libtiff/tcl/tifftclDecls.h
++++ b/libtiff/tcl/tifftclDecls.h
+@@ -25,8 +25,8 @@
+ 
+ #include <tifftclDeclsMask.h>
+ #include "../libtiff/tiffiop.h"
+-#include </usr/include/tiff.h>
+-#include </usr/include/tiffio.h>
++#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/tiff.h>
++#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/tiffio.h>
+ #include "../libtiff/tiffiop.h"
+ #include "../libtiff/tif_predict.h"
+ #include <tifftclDeclsUnmask.h>
+diff --git a/libz/tcl/zlibtclDecls.h b/libz/tcl/zlibtclDecls.h
+index 73171b1..81a5613 100644
+--- a/libz/tcl/zlibtclDecls.h
++++ b/libz/tcl/zlibtclDecls.h
+@@ -17,7 +17,7 @@
+ 
+ #include <tcl.h>
+ #include <zlibtclDeclsMask.h>
+-#include </usr/include/zlib.h>
++#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/zlib.h>
+ #include <zlibtclDeclsUnmask.h>
+ 
+ /* !BEGIN!: Do not edit below this line. */
diff --git a/dev-tcltk/tkimg/tkimg-1.3.20081202-r1.ebuild b/dev-tcltk/tkimg/tkimg-1.3.20081202-r1.ebuild
new file mode 100644
index 000000000000..7daa02ca2342
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.3.20081202-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.3.20081202-r1.ebuild,v 1.1 2010/04/01 19:58:54 jlec Exp $
+
+EAPI="3"
+inherit eutils prefix
+
+DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
+HOMEPAGE="http://sourceforge.net/projects/tkimg/"
+# src built with:
+# svn export https://tkimg.svn.sourceforge.net/svnroot/tkimg/trunk tkimg-1.3.YYYYMMDD
+# tar cvfj tkimg-1.3.YYYYMMDD.tar.bz2  tkimg-1.3.YYYYMMDD
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+IUSE="doc"
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="dev-lang/tk
+	>=dev-tcltk/tcllib-1.11
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/tiff"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-systemlibs.patch
+	epatch "${FILESDIR}"/${P}-tests.patch
+	epatch "${FILESDIR}"/${P}-prefix.patch
+	sed -i \
+		-e 's:$(prefix)/man:$(prefix)/share/man:g' \
+		Makefile.in  || die
+	eprefixify \
+		libjpeg/tcl/jpegtclDecls.h \
+		libpng/tcl/pngtclDecls.h \
+		libtiff/tcl/tifftclDecls.h \
+		libz/tcl/zlibtclDecls.h
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_ROOT="${D}" \
+		install || die "emake install failed"
+	# Make library links
+	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
+		bl=$(basename $l)
+		dosym Img1.4/${bl} /usr/$(get_libdir)/${bl}
+	done
+
+	dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE || die
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins demo.tcl || die
+		insinto /usr/share/doc/${PF}/html
+		doins -r doc/* || die
+	fi
+}
diff --git a/dev-tcltk/tkimg/tkimg-1.3.20081202.ebuild b/dev-tcltk/tkimg/tkimg-1.3.20081202.ebuild
index c937ad2f666a..da7bbfefc5cf 100644
--- a/dev-tcltk/tkimg/tkimg-1.3.20081202.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.3.20081202.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.3.20081202.ebuild,v 1.7 2009/12/07 19:51:39 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.3.20081202.ebuild,v 1.8 2010/04/01 19:58:54 jlec Exp $
 
 EAPI=2
 inherit eutils
@@ -40,7 +40,7 @@ src_install() {
 	# Make library links
 	for l in "${D}"/usr/lib*/Img*/*tcl*.so; do
 		bl=$(basename $l)
-		dosym Img1.3/${bl} /usr/$(get_libdir)/${bl}
+		dosym Img1.4/${bl} /usr/$(get_libdir)/${bl}
 	done
 
 	dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE || die