Respect LDFLAGS, 334621

Package-Manager: portage-2.2_rc91/cvs/Linux x86_64

5 files changed, 79 insertions, 12 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/Manifest b/dev-tcltk/tktray/Manifest
index 7679bf7193cd..07f4b28994cb 100644
--- a/dev-tcltk/tktray/Manifest
+++ b/dev-tcltk/tktray/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 1.1-ldflags.patch 371 RMD160 b1e460f9af112978368bd248a86ba8a160536576 SHA1 487dd6fc400a116832613de96814a5f619a632bd SHA256 944943ef5ce0085c322f30bad80e7387a7b08da32ef1cd1f49f8cf8626343bc2
 DIST tktray1.1.tar.gz 109936 RMD160 8c2fd926981ba494023111d510eb54c25b6e1304 SHA1 1a4c8ba17cae09214013e2c0de1c586cde807059 SHA256 e4c4a8ad75eacbdf2a6950dd40249dfb82897d59b999afcc05c9587081c8926f
-EBUILD tktray-1.1.ebuild 844 RMD160 b646fc3dd403e4209a3b7a3e8b6e42540e0c0867 SHA1 3c3ceb9ddc5e7ade7d34154063aa68e4c14e39c6 SHA256 2825b2cd91c643847b2b9e895c2adf82c5a428796662011330f0cd465330821d
-MISC ChangeLog 616 RMD160 d1bc4f3c3778ef9cbca1e972a8a7783c6bce3777 SHA1 b5d3ad4a43d99e0beecda48f7ab5f7e7dcb8b6bb SHA256 516c6e4e64844812a89798b4748a2448d3dfd66092450dcd5b9be741edd9a083
+EBUILD tktray-1.1-r1.ebuild 937 RMD160 55ef7ab951091cd4e8b842006701f707cdac0ce9 SHA1 4426f4cbde4271a5b15e1a8519123757d8c97df5 SHA256 10a1d96d5d19a711f87439e1aef9cf23db7de6d5326761262cccdda3182fb77d
+EBUILD tktray-1.1.ebuild 855 RMD160 0ddb9d4d1b300f240d751c3abfb13d1fd2a19f7b SHA1 ffcc1cb9501c57866edea2702134193b6c1614f7 SHA256 fa88339ffef14fc288f2afda8bb22bd0851103d0c65825e60fa0357dec57264e
+MISC ChangeLog 788 RMD160 d60fcddc5200c99e2b1787ef89ec9eb113a4a63a SHA1 5e0695a85fe124e953bc868f29520f785efdb7d0 SHA256 8c48ee3708d5e2899d9bf2ee247f1943935c7e9a1569a6a6e0fe730ca503ff99
 MISC metadata.xml 178 RMD160 8c86d72607152b4228924941d1b69e04914e5294 SHA1 3249b8f0bf46700b8f15e6fa0042ab0733648a7a SHA256 125432dca3d6ae740eecf0d20a7b038c86c32331f694eb930e66ef38992087e3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAks3Ez4ACgkQcsIHjyDViGR9KACbB78n0xSf28eAf/fgQ8tWCN9q
-BdQAn3EaZW9cZbTmDMBNCAVc06ROMHYc
-=WrMP
+iEUEARECAAYFAkyyCdAACgkQgAnW8HDreRb2tACXQ6qlLfRdhsQe+FuoEhYD/WE3
+uACeJSFMOdN97WDitK4sCs55Bf8BFtQ=
+=JKXz
 -----END PGP SIGNATURE-----
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