Install itkConfig.sh, #379243, thanks Priit Laes for the patch

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

diff --git a/dev-tcltk/itk/ChangeLog b/dev-tcltk/itk/ChangeLog
index d275ace2b316a2601492bbb9ea7132f3af50af8a..7f3d31eefdf286ef84c0dc85de8c362c69ff35ef 100644 (file)
--- a/dev-tcltk/itk/ChangeLog
+++ b/dev-tcltk/itk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-tcltk/itk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itk/ChangeLog,v 1.31 2011/06/04 18:58:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itk/ChangeLog,v 1.32 2011/08/15 17:32:55 jlec Exp $
+
+*itk-3.4_pre20090417-r1 (15 Aug 2011)
+
+  15 Aug 2011; Justin Lecher <jlec@gentoo.org> itk-3.4_pre20090417.ebuild,
+  +itk-3.4_pre20090417-r1.ebuild, +files/itk-3.4_pre20090417-install.patch,
+  metadata.xml:
+  Install itkConfig.sh, #379243, thanks Priit Laes for the patch
 
   04 Jun 2011; Raúl Porcel <armin76@gentoo.org> itk-3.4_pre20090417.ebuild:
   alpha/ia64/sparc stable wrt #363991

diff --git a/dev-tcltk/itk/Manifest b/dev-tcltk/itk/Manifest
index a9013e9483ee08a096df98dd70f16e90334727ac..ef05cb5e5ecce589a7b84c8f4f06480a19b04df9 100644 (file)
--- a/dev-tcltk/itk/Manifest
+++ b/dev-tcltk/itk/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX itk-3.4_pre20090417-install.patch 3579 RMD160 24ab2442785e7120470cc21a8af4fedbb3a2c885 SHA1 73557df9a47ded9d7ef14f171493d0068f968f5a SHA256 a5fa51039a7f1af96c3c7a5a45bb6e3e90c2258521a4fb1ea7bfbaabd1e4972f
 DIST incrTcl-3.3.1_pre20090417.tar.gz 502592 RMD160 5197d5a0f0f14200ecc313089bffc11824093598 SHA1 6c067989154c2e58083959c73d5517109ffa2047 SHA256 e59301855c7ec4e8e763e8c4c4570ccd36bb27af2dc065a945abe6e8fd4c8776
 DIST incrTcl-3.4_pre20090417.tar.gz 502592 RMD160 5197d5a0f0f14200ecc313089bffc11824093598 SHA1 6c067989154c2e58083959c73d5517109ffa2047 SHA256 e59301855c7ec4e8e763e8c4c4570ccd36bb27af2dc065a945abe6e8fd4c8776
 DIST itk3.3.tar.gz 211722 RMD160 74da1a9dfb6d6049f9d90a208d3b3166cfd2de20 SHA1 313fc2ddbe3f5b213372bc7ef870d644f38a95af SHA256 b6eee1eab759e2dc216278800624a73239ced697400bc0de4f45a4f8cd1e9ad6
 EBUILD itk-3.3-r1.ebuild 863 RMD160 43363d10da6178fed259103f830d78342741d2ae SHA1 af086ba7bb46f75683fdff341c5e20c55a3693ea SHA256 14fcb06d663632690b87971a0605f803df9c06f4d92ffadd75548fcb18683959
 EBUILD itk-3.3.1_pre20090417-r1.ebuild 925 RMD160 49e10f074844c533ccf63f3ad515effdd0924dfc SHA1 d4370ba60833efbb39989375123b4d54d29a4aeb SHA256 755ca2da66f5413df04dbcece64af4fe8cbb7fff9c97e3d09295b7949a628c1b
-EBUILD itk-3.4_pre20090417.ebuild 1032 RMD160 bd83a76fa22993bd22c2d6239ebbced81d896195 SHA1 69c1445f725d1ec253dea613d58d4ba90bd11936 SHA256 7871ce26d4b86b3637429dacdd96d0f6238e33e93b8286cbd021199f19a5477f
-MISC ChangeLog 3897 RMD160 4432a0d85a329261adf25306a7b758b7d5d7b403 SHA1 ee6793e7f7df3ed198c7dbc7f889102d6973f09c SHA256 e369b8a740167321848a9787e09cbbf4224151e2cfb9ed1dff29b782d275a445
-MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
+EBUILD itk-3.4_pre20090417-r1.ebuild 1059 RMD160 bd27b1c3ce72767598274c374f1d925631b0a972 SHA1 e3b63042d09fbdbbcef7d8da3f12a3a683d49c61 SHA256 6c1e2668e6b3de376bff2e7ceddd8b69f7736084b6fcea20d2034f6f102d36f7
+EBUILD itk-3.4_pre20090417.ebuild 1029 RMD160 af243bb3158f1190249cd7198f50057890087dd1 SHA1 781943f14892c779e6874ab1c513d6405c7e57e3 SHA256 697f4e8d9e8cb3efc1e13b4bd4afa7de606bd3fb2fbf6c95c581a9ade7f7327d
+MISC ChangeLog 4166 RMD160 302cf4a3be9e0373dcd1e44d8c9a92da18cdcfb7 SHA1 6ea05a52cd209eaecca06dd894c42aa2a213799f SHA256 b7a3a50c66c68d2dea541a4333f51196ace823d64f94b6db9fa932995dbadc2f
+MISC metadata.xml 159 RMD160 0b3f1c7d1bf45f7283ab23b3d8fa0a02c688a044 SHA1 0446a3db32f76d33bf9f76b5229b2fd9900d08c6 SHA256 fe5eea9a276e11191a0c8e266e6dc128c3dd73347bb01020814acb0863316029
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk3qgFIACgkQuQc30/atMkB+NACgqBZaIvgo4SGmJVRNMubiAoQi
-R68An01U0Aj1cBeW6f2siUlLM7RcgIc3
-=Z28R
+iEYEAREKAAYFAk5JWEwACgkQgAnW8HDreRZE9wCfQU72CJde4X2FOZMzCaO0uIFE
+XBQAn1OAUvxTHdy0PYd76zL7wjLAKRQ0
+=pWM2
 -----END PGP SIGNATURE-----

diff --git a/dev-tcltk/itk/files/itk-3.4_pre20090417-install.patch b/dev-tcltk/itk/files/itk-3.4_pre20090417-install.patch
new file mode 100644 (file)
index 0000000..a6965bc
--- /dev/null
+++ b/dev-tcltk/itk/files/itk-3.4_pre20090417-install.patch
@@ -0,0 +1,104 @@
+@@ -, +, @@ 
+ itk/Makefile.in     |    2 +-
+ itk/configure.in    |   23 +++++++++++++++++++++++
+ itk/itkConfig.sh.in |   28 +++++++++++-----------------
+ 3 files changed, 35 insertions(+), 18 deletions(-)
+--- a/itk/Makefile.in  
++++ a/itk/Makefile.in  
+@@ -395,7 +395,7 @@ install-lib-binaries:
+         fi; \
+       done
+       $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir)
+-      : $(INSTALL_DATA) itkConfig.sh $(DESTDIR)$(libdir)
++      $(INSTALL_DATA) itkConfig.sh $(DESTDIR)$(libdir)
+ 
+ #========================================================================
+ # Install binary executables (e.g. .exe files)
+--- a/itk/configure.in 
++++ a/itk/configure.in 
+@@ -219,6 +219,7 @@ fi
+ # library.
+ #--------------------------------------------------------------------
+ 
++itk_LIB_FILE=${PKG_LIB_FILE}
+ AC_SUBST(itkstub_LIB_FILE)
+ AC_SUBST(itk_LIB_FILE)
+ 
+@@ -234,6 +235,28 @@ TEA_PROG_TCLSH
+ TEA_PROG_WISH
+ 
+ #--------------------------------------------------------------------
++# These are for itkConfig.sh
++#--------------------------------------------------------------------
++
++# pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
++eval pkglibdir="${libdir}/${PACKAGE_NAME}${PACKAGE_VERSION}"
++if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
++    eval itk_LIB_FLAG="-litk${PACKAGE_VERSION}${DBGX}"
++else
++    eval itk_LIB_FLAG="-litk`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}"
++fi
++itk_BUILD_LIB_SPEC="-L`pwd` ${itk_LIB_FLAG}"
++itk_LIB_SPEC="-L${pkglibdir} ${itk_LIB_FLAG}"
++
++AC_SUBST(itk_BUILD_LIB_SPEC)
++AC_SUBST(itk_LIB_SPEC)
++
++# itk_SRC_DIR must be a fully qualified path
++eval itk_SRC_DIR="$srcdir"
++itk_SRC_DIR=`cd "${itk_SRC_DIR}"; pwd`
++AC_SUBST(itk_SRC_DIR)
++
++#--------------------------------------------------------------------
+ # Finally, substitute all of the various values into the Makefile.
+ #--------------------------------------------------------------------
+ 
+--- a/itk/itkConfig.sh.in      
++++ a/itk/itkConfig.sh.in      
+@@ -11,30 +11,23 @@ 
+ #
+ # The information in this file is specific to a single platform.
+ 
+-# Itcl's version number.
+-ITCL_VERSION='@ITCL_VERSION@'
++# Itk's version number.
++itk_VERSION='@PACKAGE_VERSION@'
++ITK_VERSION='@PACKAGE_VERSION@'
+ 
+ # The name of the Itk library (may be either a .a file or a shared library):
+-ITK_LIB_FILE=@ITK_LIB_FILE@
++itk_LIB_FILE=@itk_LIB_FILE@
++ITK_LIB_FILE=@itk_LIB_FILE@
+ 
+ # String to pass to linker to pick up the Itk library from its
+ # build directory.
+-ITK_BUILD_LIB_SPEC='@ITK_BUILD_LIB_SPEC@'
++itk_BUILD_LIB_SPEC='@itk_BUILD_LIB_SPEC@'
++ITK_BUILD_LIB_SPEC='@itk_BUILD_LIB_SPEC@'
+ 
+ # String to pass to linker to pick up the Itk library from its
+ # installed directory.
+-ITK_LIB_SPEC='@ITK_LIB_SPEC@'
+-
+-# The name of the Itk stub library (a .a file):
+-ITK_STUB_LIB_FILE=@ITK_STUB_LIB_FILE@
+-
+-# String to pass to linker to pick up the Itk stub library from its
+-# build directory.
+-ITK_BUILD_STUB_LIB_SPEC='@ITK_BUILD_STUB_LIB_SPEC@'
+-
+-# String to pass to linker to pick up the Itk stub library from its
+-# installed directory.
+-ITK_STUB_LIB_SPEC='@ITK_STUB_LIB_SPEC@'
++itk_LIB_SPEC='@itk_LIB_SPEC@'
++ITK_LIB_SPEC='@itk_LIB_SPEC@'
+ 
+ # Location of the top-level source directories from which [incr Tk]
+ # was built.  This is the directory that contains a README file as well
+@@ -42,4 +35,5 @@ ITK_STUB_LIB_SPEC='@ITK_STUB_LIB_SPEC@'
+ # compiled in a different place than the directory containing the source
+ # files, this points to the location of the sources, not the location
+ # where [incr Tk] was compiled.
+-ITK_SRC_DIR='@ITK_SRC_DIR@'
++itk_SRC_DIR='@itk_SRC_DIR@'
++ITK_SRC_DIR='@itk_SRC_DIR@'

diff --git a/dev-tcltk/itk/itk-3.4_pre20090417-r1.ebuild b/dev-tcltk/itk/itk-3.4_pre20090417-r1.ebuild
new file mode 100644 (file)
index 0000000..386803d
--- /dev/null
+++ b/dev-tcltk/itk/itk-3.4_pre20090417-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itk/itk-3.4_pre20090417-r1.ebuild,v 1.1 2011/08/15 17:32:55 jlec Exp $
+
+EAPI=4
+
+inherit autotools eutils multilib versionator
+
+MY_PN="incrTcl"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
+HOMEPAGE="http://incrtcl.sourceforge.net/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+IUSE=""
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+       dev-lang/tk
+       ~dev-tcltk/itcl-3.4_beta1"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}/${PN}"
+
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-install.patch
+       AT_M4DIR=.. eautoconf
+       sed 's:-pipe::g' -i configure || die
+}
+
+src_compile() {
+       emake CFLAGS_DEFAULT="${CFLAGS}"
+}
+
+src_install() {
+       default
+       dodoc ../{CHANGES,ChangeLog,INCOMPATIBLE,README,TODO}
+
+       cat >> "${T}"/34${PN} <<- EOF
+       LDPATH="${EPREFIX}/usr/$(get_libdir)/${PN}$(get_version_component_range 1-2)/"
+       EOF
+       doenvd "${T}"/34${PN}
+}

diff --git a/dev-tcltk/itk/itk-3.4_pre20090417.ebuild b/dev-tcltk/itk/itk-3.4_pre20090417.ebuild
index c50078ae2f4a3928dcaac4b210b133385d86c1e3..0a11692f01f1bfde8f870b27349994288b6cd3d8 100644 (file)
--- a/dev-tcltk/itk/itk-3.4_pre20090417.ebuild
+++ b/dev-tcltk/itk/itk-3.4_pre20090417.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itk/itk-3.4_pre20090417.ebuild,v 1.10 2011/06/04 18:58:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itk/itk-3.4_pre20090417.ebuild,v 1.11 2011/08/15 17:32:55 jlec Exp $
+
+EAPI=3
 
-EAPI="3"
 inherit multilib versionator
 
 MY_PN="incrTcl"
 MY_P="${MY_PN}-${PV}"
+
 DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
 HOMEPAGE="http://incrtcl.sourceforge.net/"
 SRC_URI="mirror://gentoo/${MY_P}.tar.gz"

diff --git a/dev-tcltk/itk/metadata.xml b/dev-tcltk/itk/metadata.xml
index d9408d8ab0785e07f978c7e43d45c302f8dd1a8d..815cc916f2b618800a230fc210b5dcb89f243616 100644 (file)
--- a/dev-tcltk/itk/metadata.xml
+++ b/dev-tcltk/itk/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tcltk</herd>
+       <herd>tcltk</herd>
 </pkgmetadata>