Version Bump, Respecting LDFLAGS, #335960

(Portage version: 2.2.0_alpha7/cvs/Linux x86_64)

5 files changed, 115 insertions, 12 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/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
+}