Respect LDFLAGS, 334621

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

4 files changed, 71 insertions, 6 deletions

diff --git a/dev-tcltk/tktray/ChangeLog b/dev-tcltk/tktray/ChangeLog
index 9c40fd831bca..65c7bfa08ed1 100644
--- a/dev-tcltk/tktray/ChangeLog
+++ b/dev-tcltk/tktray/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tktray
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tktray/ChangeLog,v 1.4 2009/12/27 07:58:07 josejx Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tktray/ChangeLog,v 1.5 2010/10/10 18:45:29 jlec Exp $
+
+*tktray-1.1-r1 (10 Oct 2010)
+
+  10 Oct 2010; Justin Lecher <jlec@gentoo.org> +files/1.1-ldflags.patch,
+  tktray-1.1.ebuild, +tktray-1.1-r1.ebuild:
+  Respect LDFLAGS, 334621
 
   27 Dec 2009; Joseph Jezak <josejx@gentoo.org> tktray-1.1.ebuild:
   Marked ~ppc for bug #254377.
diff --git a/dev-tcltk/tktray/files/1.1-ldflags.patch b/dev-tcltk/tktray/files/1.1-ldflags.patch
new file mode 100644
index 000000000000..0392face2958
--- /dev/null
+++ b/dev-tcltk/tktray/files/1.1-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index 9c3945b..c626019 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -107,7 +107,7 @@ OBJEXT		= @OBJEXT@
+ RANLIB		= @RANLIB@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+-SHLIB_LD	= @SHLIB_LD@
++SHLIB_LD	= @SHLIB_LD@ $(CFLAGS) $(LDFLAGS)
+ SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
+ STLIB_LD	= @STLIB_LD@
+ #TCL_DEFS	= @TCL_DEFS@
diff --git a/dev-tcltk/tktray/tktray-1.1-r1.ebuild b/dev-tcltk/tktray/tktray-1.1-r1.ebuild
new file mode 100644
index 000000000000..6eddb17cc233
--- /dev/null
+++ b/dev-tcltk/tktray/tktray-1.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tktray/tktray-1.1-r1.ebuild,v 1.1 2010/10/10 18:45:30 jlec Exp $
+
+EAPI="3"
+
+inherit eutils
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="System Tray Icon Support for Tk on X11"
+HOMEPAGE="http://sw4me.com/wiki/Tktray"
+SRC_URI="http://www.sw4me.com/${MY_P}.tar.gz"
+
+LICENSE="BWidget"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="threads debug"
+
+DEPEND=">=dev-lang/tcl-8.4
+	>=dev-lang/tk-8.4
+	x11-libs/libXext"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-ldflags.patch
+}
+
+src_configure() {
+	source /usr/lib/tclConfig.sh
+	CPPFLAGS="-I${TCL_SRC_DIR}/generic ${CPPFLAGS}" \
+	econf \
+		$(use_enable debug symbols) \
+		$(use_enable threads)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog || die
+	dohtml doc/*.html || die
+}
diff --git a/dev-tcltk/tktray/tktray-1.1.ebuild b/dev-tcltk/tktray/tktray-1.1.ebuild
index 2d4c74016bb3..a1d1a8fdb76a 100644
--- a/dev-tcltk/tktray/tktray-1.1.ebuild
+++ b/dev-tcltk/tktray/tktray-1.1.ebuild
@@ -1,12 +1,12 @@
-# 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/tktray/tktray-1.1.ebuild,v 1.4 2009/12/27 07:58:07 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tktray/tktray-1.1.ebuild,v 1.5 2010/10/10 18:45:30 jlec Exp $
 
 MY_P="${PN}${PV}"
-DESCRIPTION="tktray - System Tray Icon Support for Tk on X11"
+
+DESCRIPTION="System Tray Icon Support for Tk on X11"
 HOMEPAGE="http://sw4me.com/wiki/Tktray"
 SRC_URI="http://www.sw4me.com/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
 
 LICENSE="BWidget"
 SLOT="0"
@@ -16,6 +16,9 @@ IUSE="threads debug"
 DEPEND=">=dev-lang/tcl-8.4
 	>=dev-lang/tk-8.4
 	x11-libs/libXext"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
 
 src_compile() {
 	source /usr/lib/tclConfig.sh