Respect LDFLAGS (bug #337907). Do not hard-wire CC and CFLAGS (or do any of that other funky stuff). Set RDEPEND. Annotate ebuild.

Package-Manager: portage-2.2_rc83/cvs/Linux i686

3 files changed, 72 insertions, 3 deletions

diff --git a/net-analyzer/tleds/ChangeLog b/net-analyzer/tleds/ChangeLog
index 9f1dad2d854a..d8a3c1a958c4 100644
--- a/net-analyzer/tleds/ChangeLog
+++ b/net-analyzer/tleds/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/tleds
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tleds/ChangeLog,v 1.19 2007/07/22 08:04:24 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tleds/ChangeLog,v 1.20 2010/09/19 00:12:14 jer Exp $
+
+*tleds-1.05_beta11-r2 (19 Sep 2010)
+
+  19 Sep 2010; Jeroen Roovers <jer@gentoo.org> +tleds-1.05_beta11-r2.ebuild:
+  Respect LDFLAGS (bug #337907). Do not hard-wire CC and CFLAGS (or do any
+  of that other funky stuff). Set RDEPEND. Annotate ebuild.
 
   22 Jul 2007; <pva@gentoo.org> metadata.xml, tleds-1.05_beta11-r1.ebuild:
   Removed virtual/x11 dependency.
diff --git a/net-analyzer/tleds/Manifest b/net-analyzer/tleds/Manifest
index fc86c151b81b..ee30654df272 100644
--- a/net-analyzer/tleds/Manifest
+++ b/net-analyzer/tleds/Manifest
@@ -4,5 +4,6 @@ AUX tleds.init.d 454 RMD160 4f05a0ed312c0ed9996b066a37a5257e1442ff87 SHA1 99dbb5
 DIST tleds-1.05beta10.tgz 28640 RMD160 dc6abd5df6c5322909a18272610d03aa9f99d1b4 SHA1 4d0e287c702544afaeaa42a6a439a5c0aa1a2515 SHA256 6d139bdaf9ebc0759954d4a5ad061c87c1a3d9c2d9b674886ce93879e803b47b
 DIST tleds-1.05beta11.patch.bz2 5540 RMD160 e19374a8dfe41448eb8f45bee95af89c373530c4 SHA1 89f280e240720e44b974b93cbfc970a11358e2cb SHA256 a7542930e7e5cf537dc08cbbe70808f57db18c110ae998fc5edef206537bbeb5
 EBUILD tleds-1.05_beta11-r1.ebuild 1401 RMD160 caed5e9c225b2af06ed5a008a3993d22143f8e55 SHA1 98460bfa7eb64f5b4c161b9368adeae639a74e70 SHA256 45b6efd304ecacb506f4408faf25c44046970e054d9fcb0e1e913bbbbbb39c88
-MISC ChangeLog 2687 RMD160 253289c0e441d108d2b5c4af2657ee2cae68ab20 SHA1 5553f4f5c432e1dfb65d938f160faf3c5889ccc4 SHA256 e5dfb805d57a3c95383ddfb9ca89f1b1b24c0c3d7068aa90ab5ea00e40389039
+EBUILD tleds-1.05_beta11-r2.ebuild 1576 RMD160 19163213ab0d885b71ec7466b557421f6f8be046 SHA1 707a42fd779ab59b4dc99531667093264665c240 SHA256 32101503e9bb94b73b75bacb4e8b135968a8755fa442dc8568e82a384db72b6c
+MISC ChangeLog 2937 RMD160 31a94029f7f59594ad07430c43ae83906667d7a6 SHA1 5614caec61e672aaad7e1c03799685adee5b04e5 SHA256 07bf2bc16b101a7c3d18e4405868c5d029e74366cc04d94760d683363d2a57c4
 MISC metadata.xml 296 RMD160 5cc3d9c4396a0dc2326e88485c92f74dbad67c9f SHA1 3dd74c4d79e70874a24534af866ab36fdd963322 SHA256 b9ac3f9a667491c2f0a97f2679947077bda7861c843c1d6e68672c1021e0a70f
diff --git a/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild b/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild
new file mode 100644
index 000000000000..3fe5a326518c
--- /dev/null
+++ b/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild,v 1.1 2010/09/19 00:12:14 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+MY_P="${P/_/}"
+S="${WORKDIR}/${MY_P/eta11/}"
+DESCRIPTION="Blinks keyboard LEDs indicating outgoing and incoming network packets on selected network interface"
+HOMEPAGE="http://www.hut.fi/~jlohikos/tleds_orig.html"
+SRC_URI="http://www.hut.fi/~jlohikos/tleds/public/${MY_P/11/10}.tgz
+	http://www.hut.fi/~jlohikos/tleds/public/${MY_P}.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="X"
+
+DEPEND="X? ( >=x11-libs/libX11-1.0.0 )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	# unpack only original sources, not patches
+	unpack tleds-1.05beta10.tgz
+}
+
+src_prepare() {
+	# code patches
+	epatch \
+		"${DISTDIR}"/${MY_P}.patch.bz2 \
+		"${FILESDIR}"/${P}-gentoo.patch
+
+	# respect CC/CFLAGS/LDFLAGS, new X11 prefix
+	local opts="$(echo '$(GCCOPTS)')"
+	sed -i Makefile \
+		-e 's:-O3 -Wall:$(CFLAGS) $(LDFLAGS) -Wall:' \
+		-e 's:gcc \($(GCCOPTS)\):$(CC) \1:' \
+		-e 's:gcc \(-DNO_X_SUPPORT\):$(CC) \1:' \
+		-e 's:/usr/X11R6:/usr:g' \
+		|| die "sed failed in Makefile"
+}
+
+src_compile() {
+	if use X ; then
+		emake CC=$(tc-getCC) all || die "make failed"
+	else
+		emake CC=$(tc-getCC) tleds || die "make tleds failed"
+	fi
+}
+
+src_install() {
+	dosbin tleds
+	use X && dosbin xtleds
+
+	doman tleds.1
+	dodoc README Changes
+
+	newinitd "${FILESDIR}"/tleds.init.d tleds
+	newconfd "${FILESDIR}"/tleds.conf.d tleds
+}