Bug #124093 and #123581, patches for new libpci and gnome-2.12 from upstream dev.

(Portage version: 2.1_pre4-r1)

6 files changed, 118 insertions, 1 deletions

diff --git a/app-misc/ddccontrol/ChangeLog b/app-misc/ddccontrol/ChangeLog
index f403036ec639..a3cb5d686e94 100644
--- a/app-misc/ddccontrol/ChangeLog
+++ b/app-misc/ddccontrol/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-misc/ddccontrol
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ddccontrol/ChangeLog,v 1.8 2006/02/27 00:17:01 robbat2 Exp $
+
+*ddccontrol-0.3-r2 (27 Feb 2006)
+
+  27 Feb 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/ddccontrol-0.3-fix-libpanelapplet-dep.patch,
+  +files/ddccontrol-0.3-u64-conflicting-types.patch,
+  +ddccontrol-0.3-r2.ebuild:
+  Bug #124093 and #123581, patches for new libpci and gnome-2.12 from upstream
+  dev.
 
 *ddccontrol-0.3-r1 (20 Feb 2006)
 
diff --git a/app-misc/ddccontrol/Manifest b/app-misc/ddccontrol/Manifest
index 4a3f07534469..2ae6b9d5ebed 100644
--- a/app-misc/ddccontrol/Manifest
+++ b/app-misc/ddccontrol/Manifest
@@ -10,9 +10,18 @@ SHA256 319e750d754940e47f48d9955cd9d7a4fb1ef3ed522c81c6810bfe3c690c2e2c ddccontr
 MD5 9de31d28c5459b4bc213bf8cdde74704 ddccontrol-0.3-r1.ebuild 1509
 RMD160 4caf91b54247ed3b3a368d90813c5ef0420a8ffa ddccontrol-0.3-r1.ebuild 1509
 SHA256 d8208d6bcb1d537723c35362b247427980d8f0f5d996638a006171a26cc80148 ddccontrol-0.3-r1.ebuild 1509
+MD5 e54bc2bdb6b848db2560f8a14ea2c5ed ddccontrol-0.3-r2.ebuild 1611
+RMD160 7147f8acaf6de5f62d2059cade83dba24b02acb5 ddccontrol-0.3-r2.ebuild 1611
+SHA256 c663f65b74a06cc6f662daa8875514cc553d3c1d5f068c6ac788a2c381d42284 ddccontrol-0.3-r2.ebuild 1611
 MD5 97b37ce99868213a4026212249562d54 ddccontrol-0.3.ebuild 1355
 RMD160 980b950098910f7f07ab489630f03781e1c9c7ee ddccontrol-0.3.ebuild 1355
 SHA256 5af1bbe5be7b18df22ab31573cdbfc96668a8d7ffe954c81f2590ab1f92b6177 ddccontrol-0.3.ebuild 1355
+MD5 7fc76f4f063f312ec4773e12826b16c6 files/ddccontrol-0.3-fix-libpanelapplet-dep.patch 690
+RMD160 8496f2b7732c6b2db57e1f5965ee582b38836140 files/ddccontrol-0.3-fix-libpanelapplet-dep.patch 690
+SHA256 474770c3fb33a4ba29df7789de76fc1d8db0233abc098d50ca8373a9a7faf9cf files/ddccontrol-0.3-fix-libpanelapplet-dep.patch 690
+MD5 1ab2b7f6bb857f6a612b7186b741b5cc files/ddccontrol-0.3-u64-conflicting-types.patch 488
+RMD160 dc582418e51b53692c408958c713a1b5ea7b2cd8 files/ddccontrol-0.3-u64-conflicting-types.patch 488
+SHA256 f460d99e18ebdaa053a7e962fe4bd121450649c10bba550653228bfad60eb3e4 files/ddccontrol-0.3-u64-conflicting-types.patch 488
 MD5 ee5da560c7038f4bbad7b50af3e4b831 files/ddccontrol-asneeded.patch 582
 RMD160 ef37e0676935d4342057eb1e1baf9eb5072a1d8e files/ddccontrol-asneeded.patch 582
 SHA256 35e3abd8e73f9febb480ccb42a0c0fd1c404ee91a6d04713da3541901cc360bd files/ddccontrol-asneeded.patch 582
@@ -28,6 +37,9 @@ SHA256 f4d814a20cc9f7da43ae8c6bbf65a7a66e12a95be1fbca0d597eb4943c7f5d4e files/di
 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 9243570f0420bc2e1d8763ddb77eb991 files/digest-ddccontrol-0.3-r2 247
+RMD160 59f09bf2288c145c72279dee81510ad63d790ebe files/digest-ddccontrol-0.3-r2 247
+SHA256 edef947ecc00c12e028225419fc00715b4f3072957292d24fc1210bd751c10d3 files/digest-ddccontrol-0.3-r2 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-r2.ebuild b/app-misc/ddccontrol/ddccontrol-0.3-r2.ebuild
new file mode 100644
index 000000000000..44fc97517b2a
--- /dev/null
+++ b/app-misc/ddccontrol/ddccontrol-0.3-r2.ebuild
@@ -0,0 +1,58 @@
+# 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-r2.ebuild,v 1.1 2006/02/27 00:17:01 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}/${PN}-asneeded.patch
+	epatch ${FILESDIR}/${P}-u64-conflicting-types.patch
+	epatch ${FILESDIR}/${P}-fix-libpanelapplet-dep.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-0.3-fix-libpanelapplet-dep.patch b/app-misc/ddccontrol/files/ddccontrol-0.3-fix-libpanelapplet-dep.patch
new file mode 100644
index 000000000000..56d20973b740
--- /dev/null
+++ b/app-misc/ddccontrol/files/ddccontrol-0.3-fix-libpanelapplet-dep.patch
@@ -0,0 +1,17 @@
+Index: configure.ac
+===================================================================
+RCS file: /cvsroot/ddccontrol/ddccontrol/configure.ac,v
+retrieving revision 1.32
+retrieving revision 1.33
+diff -u -r1.32 -r1.33
+--- configure.ac	18 Nov 2005 16:07:22 -0000	1.32
++++ configure.ac	20 Feb 2006 17:27:55 -0000	1.33
+@@ -132,6 +132,8 @@
+ if test x$support_gnome_applet = xyes; then
+ 	GNOME_APPLET="gnome-ddcc-applet"
+ 	PKG_CHECK_MODULES(GNOME, libpanelapplet-2.0 >= 2.10,,GNOME_APPLET="")
++    GNOME_LDFLAGS="$LIBXML2_LDFLAGS `pkg-config --libs gtk+-2.0 gthread-2.0 libpanelapplet-2.0`"
++    GNOME_CFLAGS="$LIBXML2_CFLAGS `pkg-config --cflags gtk+-2.0 gthread-2.0 libpanelapplet-2.0`"
+ fi
+ 
+ 
diff --git a/app-misc/ddccontrol/files/ddccontrol-0.3-u64-conflicting-types.patch b/app-misc/ddccontrol/files/ddccontrol-0.3-u64-conflicting-types.patch
new file mode 100644
index 000000000000..7afef71f224c
--- /dev/null
+++ b/app-misc/ddccontrol/files/ddccontrol-0.3-u64-conflicting-types.patch
@@ -0,0 +1,18 @@
+Index: src/ddcpci/ddcpci.h
+===================================================================
+RCS file: /cvsroot/ddccontrol/ddccontrol/src/ddcpci/ddcpci.h,v
+retrieving revision 1.9
+retrieving revision 1.10
+diff -u -r1.9 -r1.10
+--- src/ddcpci/ddcpci.h	21 Sep 2005 20:45:37 -0000	1.9
++++ src/ddcpci/ddcpci.h	14 Feb 2006 19:32:48 -0000	1.10
+@@ -22,6 +22,9 @@
+ 
+ #include "i2c-algo-bit.h"
+ 
++#include <sys/types.h>
++#define PCI_HAVE_Uxx_TYPES
++
+ #include <pci/pci.h>
+ 
+ #include <libintl.h>
diff --git a/app-misc/ddccontrol/files/digest-ddccontrol-0.3-r2 b/app-misc/ddccontrol/files/digest-ddccontrol-0.3-r2
new file mode 100644
index 000000000000..7a7bb6544394
--- /dev/null
+++ b/app-misc/ddccontrol/files/digest-ddccontrol-0.3-r2
@@ -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