Bug #122640 --as-needed fixes patch from Ben Skeggs <darktama@iinet.net.au>.

(Portage version: 2.1_pre4-r1)

5 files changed, 105 insertions, 2 deletions

diff --git a/app-misc/ddccontrol/ChangeLog b/app-misc/ddccontrol/ChangeLog
index 3f2c800ee254..f403036ec639 100644
--- a/app-misc/ddccontrol/ChangeLog
+++ b/app-misc/ddccontrol/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/ddccontrol
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ddccontrol/ChangeLog,v 1.6 2005/12/12 04:09:25 robbat2 Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ddccontrol/ChangeLog,v 1.7 2006/02/20 09:03:43 robbat2 Exp $
+
+*ddccontrol-0.3-r1 (20 Feb 2006)
+
+  20 Feb 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/ddccontrol-asneeded.patch, +ddccontrol-0.3-r1.ebuild:
+  Bug #122640 --as-needed fixes patch from Ben Skeggs <darktama@iinet.net.au>.
 
 *ddccontrol-0.3 (12 Dec 2005)
 
diff --git a/app-misc/ddccontrol/Manifest b/app-misc/ddccontrol/Manifest
index 66221b46fc06..c1ce2d84e521 100644
--- a/app-misc/ddccontrol/Manifest
+++ b/app-misc/ddccontrol/Manifest
@@ -1,8 +1,33 @@
 MD5 0034d90aaf42137e7ae40b44b056571b ChangeLog 997
+RMD160 d89a0aa9faef2005d8eab1492f85409b4faae2b1 ChangeLog 997
+SHA256 c74c2ee6427f37a2fa3cb15ec5d2c4a20abc34b2735c24c32e6b2fffb95e2ef2 ChangeLog 997
 MD5 fd8b335569ccb39bfd29eddcb1d7c9e1 ddccontrol-0.1.3.ebuild 1025
+RMD160 57ceee480c2eac72b0553c278f201e5064292940 ddccontrol-0.1.3.ebuild 1025
+SHA256 7643181ddbc9611ceee1a1fe80f0e9d3012c168b480a6a0e6f678357a065aa39 ddccontrol-0.1.3.ebuild 1025
 MD5 a13ed8f1cd3da2cf2f4824f23c271a76 ddccontrol-0.2.ebuild 1030
+RMD160 cf24864a933787378518cf6eb5e26973845976dc ddccontrol-0.2.ebuild 1030
+SHA256 319e750d754940e47f48d9955cd9d7a4fb1ef3ed522c81c6810bfe3c690c2e2c ddccontrol-0.2.ebuild 1030
+MD5 2ba4fc4815c5f07624aad462675980f7 ddccontrol-0.3-r1.ebuild 1506
+RMD160 5c1bd6cadf9eda57f207365116347fdd1235af5d ddccontrol-0.3-r1.ebuild 1506
+SHA256 acfbab761afa05b5e8829e91eb5993028400e7bc4d80dff8ff6415c1464726f3 ddccontrol-0.3-r1.ebuild 1506
 MD5 97b37ce99868213a4026212249562d54 ddccontrol-0.3.ebuild 1355
+RMD160 980b950098910f7f07ab489630f03781e1c9c7ee ddccontrol-0.3.ebuild 1355
+SHA256 5af1bbe5be7b18df22ab31573cdbfc96668a8d7ffe954c81f2590ab1f92b6177 ddccontrol-0.3.ebuild 1355
+MD5 b9978996620ea60c206ce8f40c7c62ee files/ddccontrol-asneeded.patch 446
+RMD160 a3880aedd2c2ef806b0573f8a7010840d8795517 files/ddccontrol-asneeded.patch 446
+SHA256 5cf237b8ca158c96a38932443c0e36d67122f725bb3ab6ca16122ac5bd044d30 files/ddccontrol-asneeded.patch 446
 MD5 f4d016d213e8b89a8d3ca2ea85293894 files/digest-ddccontrol-0.1.3 68
+RMD160 5cb341b70174a3e2ee0fc7afa76c4a6b5be70120 files/digest-ddccontrol-0.1.3 68
+SHA256 1a9e72d76e4157091354467c956abc49ab42dd6956ebad48d0d7d1ca930c53fa files/digest-ddccontrol-0.1.3 68
 MD5 3954568974839fa232a4aeff45027648 files/digest-ddccontrol-0.2 66
+RMD160 4f8b3f015fe3a6a97b0528cf661a07eab7f218bc files/digest-ddccontrol-0.2 66
+SHA256 1a659d3d4aa633b2ba00d8664ef5909e36e9a410bbfd09b05d5d3953fcb27bda files/digest-ddccontrol-0.2 66
 MD5 1164c9ba35800faca33029e70dbf1b43 files/digest-ddccontrol-0.3 67
+RMD160 b9d70c7592cf5c10b98cb1276e2887dd6bb4c0f4 files/digest-ddccontrol-0.3 67
+SHA256 f4d814a20cc9f7da43ae8c6bbf65a7a66e12a95be1fbca0d597eb4943c7f5d4e files/digest-ddccontrol-0.3 67
+MD5 9243570f0420bc2e1d8763ddb77eb991 files/digest-ddccontrol-0.3-r1 247
+RMD160 59f09bf2288c145c72279dee81510ad63d790ebe files/digest-ddccontrol-0.3-r1 247
+SHA256 edef947ecc00c12e028225419fc00715b4f3072957292d24fc1210bd751c10d3 files/digest-ddccontrol-0.3-r1 247
 MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
+RMD160 ffa99612cf27469c417944deed0e0c9155e64331 metadata.xml 223
+SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44 metadata.xml 223
diff --git a/app-misc/ddccontrol/ddccontrol-0.3-r1.ebuild b/app-misc/ddccontrol/ddccontrol-0.3-r1.ebuild
new file mode 100644
index 000000000000..a33b3911bcd5
--- /dev/null
+++ b/app-misc/ddccontrol/ddccontrol-0.3-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ddccontrol/ddccontrol-0.3-r1.ebuild,v 1.1 2006/02/20 09:03:43 robbat2 Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="DDCControl allows control of monitor parameters via DDC"
+HOMEPAGE="http://ddccontrol.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk gnome doc nls"
+
+RDEPEND="dev-libs/libxml2
+	gtk? ( >=x11-libs/gtk+-2.4 )
+	gnome? ( >=gnome-base/gnome-panel-2.10 )
+	sys-apps/pciutils
+	nls? ( sys-devel/gettext )
+	>=app-misc/ddccontrol-db-20051114"
+DEPEND="${RDEPEND}
+	doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1
+		   >=dev-libs/libxslt-1.1.6
+	       app-text/htmltidy )
+	sys-kernel/linux-headers"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Fix --as-needed errors
+	epatch ${FILESDIR}/ddccontrol-asneeded.patch
+
+	# Fix sandbox violation
+	for i in Makefile.am Makefile.in; do
+		sed -i.orig "${S}/src/gddccontrol/${i}" \
+		-e "/@INSTALL@/s/ \$(datadir)/ \$(DESTDIR)\/\$(datadir)/" \
+		|| die "Failed to fix DESTDIR"
+	done
+
+	eautoreconf || die "eautoreconf failed"
+}
+
+src_compile() {
+	econf $(use_enable doc) \
+		$(use_enable gtk gnome) \
+		$(use_enable gnome gnome-applet) \
+		$(use_enable nls) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" htmldir="/usr/share/doc/${PF}/html" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/app-misc/ddccontrol/files/ddccontrol-asneeded.patch b/app-misc/ddccontrol/files/ddccontrol-asneeded.patch
new file mode 100644
index 000000000000..8b15e4443d6b
--- /dev/null
+++ b/app-misc/ddccontrol/files/ddccontrol-asneeded.patch
@@ -0,0 +1,13 @@
+Gentoo Bug #122640 --as-needed fixes
+Signed-off-by: Ben Skeggs <darktama@iinet.net.au>
+Acked-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nur ddccontrol-0.3.old/src/lib/Makefile.am ddccontrol-0.3/src/lib/Makefile.am
+--- ddccontrol-0.3.old/src/lib/Makefile.am	2005-10-26 05:22:44.000000000 +1100
++++ ddccontrol-0.3/src/lib/Makefile.am	2006-02-13 14:29:01.000000000 +1100
+@@ -8,4 +8,5 @@
+ 
+ libddccontrol_la_SOURCES = ddcci.c ddcci.h monitor_db.c monitor_db.h \
+    ddcpci-ipc.h i2c-dev.h conf.c conf.h
++libddccontrol_la_LIBADD = $(LIBXML2_LDFLAGS)
+ AM_CFLAGS = $(LIBXML2_CFLAGS)
diff --git a/app-misc/ddccontrol/files/digest-ddccontrol-0.3-r1 b/app-misc/ddccontrol/files/digest-ddccontrol-0.3-r1
new file mode 100644
index 000000000000..7a7bb6544394
--- /dev/null
+++ b/app-misc/ddccontrol/files/digest-ddccontrol-0.3-r1
@@ -0,0 +1,3 @@
+MD5 dcb19759a97d43b75a0c07dcf8a2350b ddccontrol-0.3.tar.bz2 409079
+RMD160 5eccb60c3f82bc5c84b3f75e2886138f12fbf46d ddccontrol-0.3.tar.bz2 409079
+SHA256 b8e604b2d4a388fb0a9d820480fe52918ab8c24383f51d4d23a2617ffe775e3e ddccontrol-0.3.tar.bz2 409079