Version Bump, Respecting LDFLAGS, #335960

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

6 files changed, 125 insertions, 18 deletions

diff --git a/dev-tcltk/tkzinc/ChangeLog b/dev-tcltk/tkzinc/ChangeLog
index 0a108e22baf1..de98ab48239e 100644
--- a/dev-tcltk/tkzinc/ChangeLog
+++ b/dev-tcltk/tkzinc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tkzinc
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkzinc/ChangeLog,v 1.6 2008/09/03 11:44:20 opfer Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkzinc/ChangeLog,v 1.7 2010/12/07 18:36:10 jlec Exp $
+
+*tkzinc-3.3.6 (07 Dec 2010)
+
+  07 Dec 2010; Justin Lecher <jlec@gentoo.org> +files/3.3.4-ldflags.patch,
+  +files/3.3.6-ldflags.patch, tkzinc-3.3.4.ebuild, +tkzinc-3.3.6.ebuild:
+  Version Bump, Respecting LDFLAGS, #335960
 
   03 Sep 2008; Christian Faulhammer <opfer@gentoo.org> tkzinc-3.3.4.ebuild:
   replace virtual/tetex with virtual/latex-base
diff --git a/dev-tcltk/tkzinc/Manifest b/dev-tcltk/tkzinc/Manifest
index b81f89e647fe..760720b51a59 100644
--- a/dev-tcltk/tkzinc/Manifest
+++ b/dev-tcltk/tkzinc/Manifest
@@ -1,14 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 3.3.4-ldflags.patch 552 RMD160 bd50bf82b28dc14151fc55e4f07a1eaa9b55a0b3 SHA1 0fc22bbcd86387525b1c280cdcda1e20aa03603f SHA256 297ba730e1af946c4023d05fde17feb3d0ab0e41c9bfc85ca8b7d77fc20ad44b
+AUX 3.3.6-ldflags.patch 552 RMD160 8b7a95961ce3ceccc33e80a560a6f3af2aaadb8d SHA1 d6c579e6b9b99e2a7fd35afcb38f7c08ed45a3e3 SHA256 3a301c752e78400ba8b91469f990e44ee1d6f6af0aca6431cb9fcd56ab26c438
+DIST Tkzinc-3.3.6plus.tar.gz 1924729 RMD160 f6f50b0c10938fcf26705942f3a759d49e4edf05 SHA1 f379ef81a5b4d708ad6a7d83500cdf62f57ea267 SHA256 6a23a647a2062bc9f5a773092cbb6c63ee5e7564a8c8751839dcca79d807ff56
 DIST zinc-tk_3.3.4.tar.gz 2785947 RMD160 984925dc69e3594e144a00cb9fb4409438da2ce0 SHA1 e5af68685ed4d47e6871aed3d84272188bd46f2d SHA256 5f65fd1bf8e2d26736c892758b74259eb8642346b92d6467ea8653b5f744e26c
-EBUILD tkzinc-3.3.4.ebuild 856 RMD160 a9f499f5511c467dd9d273c4fecda382bd7a8e62 SHA1 cd983dff59855aeb0c3b0c0d69980c6e9dfad539 SHA256 8f63a3a8e6ac95bbe9e4688a56007b4bf6ad4fca060921a54ab59ebd759fa8c3
-MISC ChangeLog 1188 RMD160 97398d3ded8eb94710cb2f9dddfbd9c81fd6b6e3 SHA1 ac6bc598dadd517cd1380f502906e9a55880560d SHA256 82d6ddafa6828602f4d1e01524d0597e98b711d116af57e20192b8e5187be2ec
+EBUILD tkzinc-3.3.4.ebuild 1070 RMD160 f42ba986f813d244f6805f00aeeccfaca78c02a8 SHA1 b836e47ba68c6f11d269d44ff35e54e6752a0c30 SHA256 842824d8c24ff01ae1c4d289e4a98871d7679af9a49c0b69923f2a6c4da79ed1
+EBUILD tkzinc-3.3.6.ebuild 1083 RMD160 460209b09a2ea025801c0f17684126c3b351774d SHA1 e471ae14726df47ef0ae87d71c445d2924b30fa3 SHA256 7f2b2bfc564042e7496ddb73302199bec177a4e6fcbeb0b892bacf7a9b3fb23a
+MISC ChangeLog 1409 RMD160 144c13d36dcd71953ed33c5604c3b875fd1ac78f SHA1 2c49891f73565b125774557a13d9aeafb4f93898 SHA256 7520dc3dbb6834b6ae7e305840a2bfcf8569c2dda5651b8e9a5936cb48b7c499
 MISC metadata.xml 260 RMD160 68efc756529904db80cc5e2596c2a3fb177ed646 SHA1 48ecc0a225ae2463e601c22dda4cf2c9c0e89626 SHA256 1050070bd73b44e9311028cf233b7df52feee364c22b9524ec94737d0017a682
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAki+eL4ACgkQNQqtfCuFneM+VgCfcvGk1hmVBr0aXTAYM8o/aHIo
-734An125npy3ZiB/2J7r3guX50Za0JJX
-=ZTcx
+iEYEARECAAYFAkz+fqIACgkQgAnW8HDreRYuawCgs349FQ2N4CQSrqwuSeWyLh70
+9SoAoL/JeDhj4sWwT4e7t+oG6tpGHtcX
+=G4QN
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tkzinc/files/3.3.4-ldflags.patch b/dev-tcltk/tkzinc/files/3.3.4-ldflags.patch
new file mode 100644
index 000000000000..6f4264d8bd6a
--- /dev/null
+++ b/dev-tcltk/tkzinc/files/3.3.4-ldflags.patch
@@ -0,0 +1,14 @@
+diff --git a/tclconfig/tcl.m4 b/tclconfig/tcl.m4
+index ff26a0f..faba464 100644
+--- a/tclconfig/tcl.m4
++++ b/tclconfig/tcl.m4
+@@ -1447,7 +1447,8 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    # get rid of the warnings.
+ 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 
+-	    SHLIB_LD="${CC} -shared"
++	    # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS
++	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS_DEFAULT} ${LDFLAGS}'
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+ 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
diff --git a/dev-tcltk/tkzinc/files/3.3.6-ldflags.patch b/dev-tcltk/tkzinc/files/3.3.6-ldflags.patch
new file mode 100644
index 000000000000..903ef9a2eaee
--- /dev/null
+++ b/dev-tcltk/tkzinc/files/3.3.6-ldflags.patch
@@ -0,0 +1,14 @@
+diff --git a/tclconfig/tcl.m4 b/tclconfig/tcl.m4
+index 0cbca13..c68af63 100644
+--- a/tclconfig/tcl.m4
++++ b/tclconfig/tcl.m4
+@@ -1447,7 +1447,8 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    # get rid of the warnings.
+ 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 
+-	    SHLIB_LD="${CC} -shared"
++	    # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS
++	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS_DEFAULT} ${LDFLAGS}'
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+ 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
diff --git a/dev-tcltk/tkzinc/tkzinc-3.3.4.ebuild b/dev-tcltk/tkzinc/tkzinc-3.3.4.ebuild
index 828d198cbaab..7361107293c4 100644
--- a/dev-tcltk/tkzinc/tkzinc-3.3.4.ebuild
+++ b/dev-tcltk/tkzinc/tkzinc-3.3.4.ebuild
@@ -1,37 +1,53 @@
-# Copyright 1999-2008 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/tkzinc/tkzinc-3.3.4.ebuild,v 1.3 2008/09/03 11:44:20 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkzinc/tkzinc-3.3.4.ebuild,v 1.4 2010/12/07 18:36:10 jlec Exp $
 
-inherit eutils
+EAPI="3"
+
+inherit autotools eutils
 
 DESCRIPTION="A Tk widget library."
 HOMEPAGE="http://www.tkzinc.org"
 SRC_URI="http://www.tkzinc.org/Packages/zinc-tk_${PV}.tar.gz"
+
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE="threads doc"
-DEPEND=">=dev-lang/tk-8.4
+IUSE="debug doc threads"
+
+DEPEND="
+	dev-lang/tk
+	media-libs/glew
 	virtual/opengl
 	doc? ( virtual/latex-base )"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/Tkzinc"
 
-src_compile() {
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-ldflags.patch
+	eautoreconf
+}
+
+src_configure() {
 	econf \
+		--enable-shared \
 		--enable-gl=damage \
-		$(use_enable threads) || die
+		$(use_enable debug symbols) \
+		$(use_enable threads)
+}
 
+src_compile() {
 	emake || die "make failed"
 	if use doc ; then
-		make pdf || die "make pdf files failed"
+		emake pdf || die "make pdf files failed"
 	fi
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 
-	dodoc BUGS README
-	dohtml -r doc/*
+	dodoc BUGS README || die
+	dohtml -r doc/* || die
 	use doc && dodoc doc/refman.pdf
 }
diff --git a/dev-tcltk/tkzinc/tkzinc-3.3.6.ebuild b/dev-tcltk/tkzinc/tkzinc-3.3.6.ebuild
new file mode 100644
index 000000000000..2668605ed975
--- /dev/null
+++ b/dev-tcltk/tkzinc/tkzinc-3.3.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkzinc/tkzinc-3.3.6.ebuild,v 1.1 2010/12/07 18:36:10 jlec Exp $
+
+EAPI="3"
+
+inherit autotools eutils
+
+DESCRIPTION="A Tk widget library."
+HOMEPAGE="http://www.tkzinc.org"
+SRC_URI="http://www.tkzinc.org/Packages/Tkzinc-${PV}plus.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
+IUSE="debug doc threads"
+
+DEPEND="
+	dev-lang/tk
+	media-libs/glew
+	virtual/opengl
+	doc? ( virtual/latex-base )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/Tkzinc-${PV//.}+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-ldflags.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--enable-gl=damage \
+		$(use_enable debug symbols) \
+		$(use_enable threads)
+}
+
+src_compile() {
+	emake || die "make failed"
+	if use doc ; then
+		emake pdf || die "make pdf files failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc BUGS README || die
+	dohtml -r doc/* || die
+	use doc && dodoc doc/refman.pdf
+}