From b2f765f042baaea7aff5d795dc45600dc5503249 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Thu, 1 Apr 2010 19:58:54 +0000 Subject: [PATCH] Fix for bug 298113, Prefix support Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- dev-tcltk/tkimg/ChangeLog | 10 +++- dev-tcltk/tkimg/Manifest | 14 +++-- .../files/tkimg-1.3.20081202-prefix.patch | 56 ++++++++++++++++++ dev-tcltk/tkimg/tkimg-1.3.20081202-r1.ebuild | 59 +++++++++++++++++++ dev-tcltk/tkimg/tkimg-1.3.20081202.ebuild | 6 +- 5 files changed, 134 insertions(+), 11 deletions(-) create mode 100644 dev-tcltk/tkimg/files/tkimg-1.3.20081202-prefix.patch create mode 100644 dev-tcltk/tkimg/tkimg-1.3.20081202-r1.ebuild 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 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 -tkimg-1.3.ebuild, -files/tkimg-1.3-m4.patch, tkimg-1.3.20081202.ebuild, diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest index 0802c5cbea16..00ca0d94622f 100644 --- a/dev-tcltk/tkimg/Manifest +++ b/dev-tcltk/tkimg/Manifest @@ -1,16 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX tkimg-1.3.20081202-prefix.patch 1786 RMD160 ad867dde7d6e431caaee180093eac6bc0e5bb1f6 SHA1 c6eb5eadf43c455ae28335215393f9fdc3c23def SHA256 6f66f0d0b95e282a6ed082dac34db387aa4bbe13c2ab56f1baef6f66682574a5 AUX tkimg-1.3.20081202-systemlibs.patch 9637 RMD160 fc6a94501654307bae837731f18e8a827eb21db4 SHA1 87e9d8a3d60da0a42b92d9a1c35ab989452b4645 SHA256 29608daf79cca4a6b1292d1875ebd7d5f07ad60d4e09098ea5b8ece801da1983 AUX tkimg-1.3.20081202-tests.patch 982 RMD160 ae52f7b9eb1504c1c116fe384abe3db806523239 SHA1 decd791a9ac761bfee56a0114a407960976a2a52 SHA256 28bc15f436d73cbd7ae91dc480aacc51dbcf5f3fa7125640742cfea9aed964b6 DIST tkimg-1.3.20081202.tar.bz2 4543694 RMD160 00f4dc4d8da53c7acaab68565f58ffc42f8151af SHA1 01acba5ad79f12e7d5ce511d35a9829424afa8ec SHA256 4e94f709fb471ec70398c1d4565fbec5869d0a521c7de5292484deeafc727625 -EBUILD tkimg-1.3.20081202.ebuild 1390 RMD160 60b336fc085450c222a2083daab1cc94fd6cc5e9 SHA1 f80fa1240dd92e9e49a6a8449b0d7085d26b533a SHA256 4243fd6ff22426346d433b04e2025b6cffaa168dbd62c6da2f04e7fde03c727f -MISC ChangeLog 2008 RMD160 2067f9890a229ae32b32f287d3ac0da48e093e79 SHA1 8e0dcb92081f878e35fde8d4400b76fe6760b7c8 SHA256 e0a38926725808df2c0de8b3b265c63ce8043f90684d0920ac8db170435c35e2 +EBUILD tkimg-1.3.20081202-r1.ebuild 1570 RMD160 87c956d43a5267d668465a4a1328188c5b2574d9 SHA1 b881032964098289e2ea4f4ca82b0c8c02ce0bfc SHA256 9398a9839f78c969f4eaffff947e87ae6f07e5157159b4a4a0059c2a8391c09c +EBUILD tkimg-1.3.20081202.ebuild 1386 RMD160 bac7f154f05d43cde3144a67c3ac13412c454e60 SHA1 222e398598524eb2a42d864670a104021c32c1c1 SHA256 a5a07240aeb6d0aee29e8512f7be8a5e9f1b17fe0c650e4892b77f56325f3b66 +MISC ChangeLog 2227 RMD160 75b4c66c3618e5a1d35d2173b6d7da8e9233c226 SHA1 1209b497e661182b44476ba474848157319ce9ce SHA256 132f0102d8efa1edf7c8a5fb186d8795ee5dba20ec6e059bb2c43d558d0ea7fd MISC metadata.xml 413 RMD160 1ac848d3c3c9bdc181eb74296bed320a04939230 SHA1 b87cf6e1539c38b9d47206b3de300d4d1b015e19 SHA256 e4be7858b69d8be49bd900961e05825edcacfb4c81b6f20ebc6afd65fb3b2fc8 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.13 (GNU/Linux) +Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAksdaU8ACgkQ1ycZbhPLE2BxugCgh6DDZLv+ffFA8vCsyg4/hTZI -2MkAnRd9m7jL7GYML5+63aq3CqjgDTLp -=3P43 +iEYEARECAAYFAku0+wMACgkQgAnW8HDreRbjJgCdF8hWtFU/ULv4WkZH2Tce2L6x ++A0AoMDCIEgsGWPNqYNBU8EdEjEnR9ez +=/RNP -----END PGP SIGNATURE----- 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 +-#include ++#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 + #include +-#include ++#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/libpng12/png.h> + #include + + /* !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 + #include "../libtiff/tiffiop.h" +-#include +-#include ++#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 +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 + #include +-#include ++#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/zlib.h> + #include + + /* !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 -- 2.26.2