Migrate to EAPI=4, fix build with newer automake with patch from upstream, add USE=static-libs support, and add USE=ddcpci to control the setuid binary.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

6 files changed, 179 insertions, 10 deletions

diff --git a/app-misc/ddccontrol/ChangeLog b/app-misc/ddccontrol/ChangeLog
index 63eec3e75e3f..99cdc83915aa 100644
--- a/app-misc/ddccontrol/ChangeLog
+++ b/app-misc/ddccontrol/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/ddccontrol
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ddccontrol/ChangeLog,v 1.22 2011/03/29 12:14:22 angelos Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ddccontrol/ChangeLog,v 1.23 2012/01/25 02:17:34 vapier Exp $
+
+*ddccontrol-0.4.2-r1 (25 Jan 2012)
+
+  25 Jan 2012; Mike Frysinger <vapier@gentoo.org> +ddccontrol-0.4.2-r1.ebuild,
+  +files/ddccontrol-0.4.2-automake.patch,
+  +files/ddccontrol-0.4.2-no-ddcpci.patch, metadata.xml:
+  Migrate to EAPI=4, fix build with newer automake with patch from upstream,
+  add USE=static-libs support, and add USE=ddcpci to control the setuid binary.
 
   29 Mar 2011; Christoph Mende <angelos@gentoo.org> ddccontrol-0.1.3.ebuild,
   ddccontrol-0.2.ebuild, ddccontrol-0.3.ebuild, ddccontrol-0.3-r1.ebuild,
diff --git a/app-misc/ddccontrol/Manifest b/app-misc/ddccontrol/Manifest
index 80d8bdc0fc46..b86239e3bb4f 100644
--- a/app-misc/ddccontrol/Manifest
+++ b/app-misc/ddccontrol/Manifest
@@ -1,8 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX ddccontrol-0.3-fix-libpanelapplet-dep.patch 690 RMD160 8496f2b7732c6b2db57e1f5965ee582b38836140 SHA1 c11fcc977df450b10e63170b7d1b91835d5133ec SHA256 474770c3fb33a4ba29df7789de76fc1d8db0233abc098d50ca8373a9a7faf9cf
 AUX ddccontrol-0.3-u64-conflicting-types.patch 488 RMD160 dc582418e51b53692c408958c713a1b5ea7b2cd8 SHA1 23af3340a66515c64849ba60c061611c7f70ee94 SHA256 f460d99e18ebdaa053a7e962fe4bd121450649c10bba550653228bfad60eb3e4
+AUX ddccontrol-0.4.2-automake.patch 2149 RMD160 349643237cb29f072e4aad823e43997227ddd521 SHA1 346c6ffae656d00a5af5f7d482123362b23d63fb SHA256 c31761783cfd9587fb68d94739794833a6f47789922017530de07fb1133f78b8
+AUX ddccontrol-0.4.2-no-ddcpci.patch 289 RMD160 47ffaf549a79223b4d5b42811f7c651b6e7bd303 SHA1 69d3f1b244f7c283e4551ce00ddc885639d0ad6a SHA256 9f2d7dfa3446374bf06995096e8cb6812322a2144d4ce0b45a1df20553b72130
 AUX ddccontrol-0.4.2-pciutils-libz.patch 1016 RMD160 46874251ba5ef81193007a2486f656b76f230c69 SHA1 c8a6a021dcb1e00351de0fb8bbe8b115f6cf164c SHA256 014568b96f9450805e012d7dc5b0df0c4d3922694da4ad143bb96d429303fb9b
 AUX ddccontrol-asneeded.patch 582 RMD160 ef37e0676935d4342057eb1e1baf9eb5072a1d8e SHA1 3b476bd315985d82d7c1bc413cbe44a045a09ae8 SHA256 35e3abd8e73f9febb480ccb42a0c0fd1c404ee91a6d04713da3541901cc360bd
 DIST ddccontrol-0.1.3.tar.gz 251097 RMD160 6426553fba5681d31efcad9bc68c2e92c621c341 SHA1 239a287a1aba6b4654d15c6016995713a2d16991 SHA256 fb0a77be11c34dc44554315d90e56372e7c87f1fb78feb05f9228d205c4cfe9b
@@ -16,15 +18,24 @@ EBUILD ddccontrol-0.3-r1.ebuild 1524 RMD160 9e59ff4ecf9e741de1ebca0bd9ea9e65455b
 EBUILD ddccontrol-0.3-r2.ebuild 1604 RMD160 c7858e8f6e94b8c5d64b9538a2ecc2732ed232eb SHA1 ef5fb513322fa64ab8d30a2784c13ff695aa1a8c SHA256 36fd6bc9683fa5e3f6ae8cee738889e164835d5137a227fc81d67826450c5cec
 EBUILD ddccontrol-0.3.ebuild 1367 RMD160 71c69a6ae7161d6843a90af590a1aba11136a614 SHA1 5efb7b84a6c9c04125a318eae4eed548066f295c SHA256 048e051b7a4f504d4b996dcdc4de89a309e552761c19d8f879d7db31038f5a2e
 EBUILD ddccontrol-0.4.1.ebuild 1482 RMD160 ee5a25342c0c154acd35af4901de75abc2aa8aed SHA1 6f23a28bb1b6d165a2bf8e882c758d83cd6557bb SHA256 8bee601b4dd9956aafa6f0e8e93613f2323f085c976c134cc4a52eb4dc3777f1
+EBUILD ddccontrol-0.4.2-r1.ebuild 1893 RMD160 ee9570476a6f5e9d39a31bbb488da35210aa6fbc SHA1 c005472179f02e730d1d7f5ac6a9ee30f8d5173a SHA256 0d99848219268c3ab1b5e2bc26c5ef359bda0a509a80e328d76cc490f34742ea
 EBUILD ddccontrol-0.4.2.ebuild 2070 RMD160 49488bdc9ca3a03ac70eac305a8d5772036ddb2d SHA1 6f219ceaf5be23f6e42c11d8033dafa08b3e02a9 SHA256 807a43290fccc42759975c42dde2462414f0e539a399ba9bf776228af2837c8d
-MISC ChangeLog 3559 RMD160 67f8e9afc987602c19315044f71c40f0960f3bfa SHA1 b2689bf0941e49a68e51d8e7685e109e666bebe6 SHA256 d74f9b6a7ca9852d0eea513e4d380a7f3a48a69ceb1704b651c5a559a9b43ee1
-MISC metadata.xml 381 RMD160 401d89fc1dc5430cf2985d9353c316baa6ac208a SHA1 75c85993fb5540d6f7f1339f005095ba99434db6 SHA256 7737ec8e3382ae2387f389b2839745368fd2489e2e0b135d75835016d36ae960
+MISC ChangeLog 3930 RMD160 a486c78a8ac2f494b5676ad7ff2e52607f55437d SHA1 535d8c69cadf4263e6097a8ade4b9e4214d989b8 SHA256 047c07441be6ae5806e9742323823cd9371ed484c6e67a4c924bf1b7b7cdd45e
+MISC metadata.xml 479 RMD160 3ae3a8f11dcdaed0e570467da274503ab6840844 SHA1 cd5b65d6d4216c68dbfa54dfa04337d820bfa408 SHA256 3cc5d472e421e987e7028da0aa8feb0a783ce08d4eef8dd98d88ccce1bff7324
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk58/5YACgkQfXuS5UK5QB0KRwP/S8qP/G41iKTeZ0Dj8bUjaw/z
-5QSTUXDAejKhc3e7GFS9YCfhSn+H53DYPpbGyheDY7xBcLekZz5UKhGdYdOLWQ7u
-rEV8XCVNpIjey4VMNqVU5xsk9MCCbagmdGR8c9hSnpbw+ipakVqb5LDwgFJNiJXr
-DT2hWMXFILXXVCteiyY=
-=zIbN
+iQIcBAEBAgAGBQJPH2ZsAAoJELEHsLL7fEFWhTYQALSql8y5PgQ42Lmw9QmJfKvr
+UtuqL2SoFgHXbfOzMV9VzUzM4ruB7U4fQ3udPG2IracNaDyl8XLRmj06ilA7PNmn
+xsmOhIRsf/xNMupNBaW+hWDng5W7rQiwezguPz5X2/xGCaVXf1fvG9z8ljgsq+zn
+iWm/qG98a2u/FE/U8iMQqTJ/+NrSzMMtSu8esH5ESJ6ZVGSaIZlJjQ+rOTPI4q0E
+9BquRXz7xC0yKVOs7v/Sy9uXA7Iz6is3mINXzo+rWvP+YRpxzkeg5GR8n+fCluvn
+3JgIvPdFnYC3SlY/ANefO/nXNdgNM4D5UedtdVXmGcaRGWy5Supv7/rT4So+lHyh
+TDuYtFIVSIg1PUb7heLyJ9vbsSQxfeYfPQZEBCjW2IwLbUGPj4qGuXLfxggVw+pt
+UxaYXPeR8w7hHwZMO78ziIPvUr/yk2HLAEKj11S0M5DdNnyRIlaMOGaCp2EamL94
+93Yr+uBLAahPZyuHPpeOt+CVDYKLWtX1AnX/GM+NmvWsFzaPdA8BYEazj9w375ke
+DZDpR3zp5HNgQ2TKJPbQ3MSvHHTCHOlihXHiUSEjM+zFhHOve3LjGn8UrUSfeBOu
+hgrViWdV4rfq2Y7kywEDI+RI+upY5tLKKelY8NMuENE4eOcJZxCaygNNyViux+Zu
+YfHN8yyV4We+nRepCojM
+=ApMH
 -----END PGP SIGNATURE-----
diff --git a/app-misc/ddccontrol/ddccontrol-0.4.2-r1.ebuild b/app-misc/ddccontrol/ddccontrol-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..f696e98a89b7
--- /dev/null
+++ b/app-misc/ddccontrol/ddccontrol-0.4.2-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ddccontrol/ddccontrol-0.4.2-r1.ebuild,v 1.1 2012/01/25 02:17:34 vapier Exp $
+
+EAPI="4"
+
+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 ~ppc ~x86"
+IUSE="+ddcpci doc gnome gtk nls static-libs"
+
+RDEPEND="dev-libs/libxml2:2
+	gtk? ( >=x11-libs/gtk+-2.4:2 )
+	gnome? ( >=gnome-base/gnome-panel-2.10 )
+	sys-apps/pciutils
+	nls? ( sys-devel/gettext )
+	>=app-misc/ddccontrol-db-20060730"
+DEPEND="${RDEPEND}
+	dev-perl/XML-Parser
+	dev-util/intltool
+	doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1
+		   >=dev-libs/libxslt-1.1.6
+	       app-text/htmltidy )
+	sys-kernel/linux-headers"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-pciutils-libz.patch
+	epatch "${FILESDIR}"/${P}-automake.patch
+	epatch "${FILESDIR}"/${P}-no-ddcpci.patch
+	sed -i '/^htmldir/d' doc/Makefile.am || die
+
+	# ppc/ppc64 do not have inb/outb/ioperm
+	# they also do not have (sys|asm)/io.h
+	if ! use amd64 && ! use x86 ; then
+		local card
+		for card in sis intel810 ; do
+			sed -r -i \
+				-e "/${card}.Po/d" \
+				-e "s~${card}[^[:space:]]*~ ~g" \
+				src/ddcpci/Makefile.{am,in}
+		done
+		sed -i \
+			-e '/sis_/d' \
+			-e '/i810_/d' \
+			src/ddcpci/main.c
+	fi
+
+	## Save for a rainy day or future patching
+	eautoreconf
+	intltoolize --force || die "intltoolize failed"
+}
+
+src_configure() {
+	econf \
+		--htmldir='$(datarootdir)'/doc/${PF}/html \
+		$(use_enable ddcpci) \
+		$(use_enable doc) \
+		$(use_enable gnome gnome-applet) \
+		$(use_enable gtk gnome) \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/app-misc/ddccontrol/files/ddccontrol-0.4.2-automake.patch b/app-misc/ddccontrol/files/ddccontrol-0.4.2-automake.patch
new file mode 100644
index 000000000000..005efc51c636
--- /dev/null
+++ b/app-misc/ddccontrol/files/ddccontrol-0.4.2-automake.patch
@@ -0,0 +1,60 @@
+taken from upstream git
+
+From 1c5eaf9ca5cb03d4124d54b4178d4a2a47a724d7 Mon Sep 17 00:00:00 2001
+From: Stanislav Brabec <sbrabec@suse.cz>
+Date: Sun, 10 Oct 2010 18:29:16 +0200
+Subject: [PATCH] Applied ddccontrol-libexecdir.patch
+
+---
+ .../GNOME_ddcc-applet.server.in.in                 |    2 +-
+ src/gnome-ddcc-applet/Makefile.am                  |   12 +++++++-----
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/src/gnome-ddcc-applet/GNOME_ddcc-applet.server.in.in b/src/gnome-ddcc-applet/GNOME_ddcc-applet.server.in.in
+index f3a28ba..89a6615 100644
+--- a/src/gnome-ddcc-applet/GNOME_ddcc-applet.server.in.in
++++ b/src/gnome-ddcc-applet/GNOME_ddcc-applet.server.in.in
+@@ -2,7 +2,7 @@
+ 
+ <oaf_server iid="OAFIID:GNOME_ddcc-applet_Factory"
+             type="exe"
+-            location="@PKGLIBDIR@/ddcc-applet">
++            location="@appletdir@/ddcc-applet">
+ 
+         <oaf_attribute name="repo_ids" type="stringv">
+                 <item value="IDL:Bonobo/GenericFactory:1.0"/>
+diff --git a/src/gnome-ddcc-applet/Makefile.am b/src/gnome-ddcc-applet/Makefile.am
+index d16fbd0..6218efa 100644
+--- a/src/gnome-ddcc-applet/Makefile.am
++++ b/src/gnome-ddcc-applet/Makefile.am
+@@ -6,9 +6,10 @@ DDCC_LDADD = ../lib/libddccontrol.la
+ 
+ EXTRA_DIST = GNOME_ddcc-applet.server.in.in GNOME_ddcc-applet.xml
+ 
+-pkglib_PROGRAMS = ddcc-applet
+-ddcc_applet_SOURCES = ddcc-applet.c ddcc-applet.h
++applet_PROGRAMS = ddcc-applet
++appletdir = $(libexecdir)
+ 
++ddcc_applet_SOURCES = ddcc-applet.c ddcc-applet.h
+ ddcc_applet_LDADD = $(GNOME_LDFLAGS) $(DDCC_LDADD)
+ AM_CFLAGS = $(GNOME_CFLAGS) '-DPKGDATADIR="$(pkgdatadir)"'
+ 
+@@ -18,10 +19,11 @@ serverdir       = $(libdir)/bonobo/servers
+ server_in_files = GNOME_ddcc-applet.server.in
+ server_DATA     = $(server_in_files:.server.in=.server)
+ 
+-$(server_in_files): $(server_in_files:.server.in=.server.in.in)
+-	sed -e "s|\@PKGLIBDIR\@|$(pkglibdir)|" $< > $@
++$(server_in_files): $(server_in_files:.server.in=.server.in.in) Makefile
++	$(AM_V_GEN)sed \
++	    -e "s|\@appletdir\@|$(appletdir)|" \
++	    $< > $@
+ 
+ CLEANFILES = $(server_in_files) $(server_DATA)
+ 
+ @INTLTOOL_SERVER_RULE@
+-
+-- 
+1.7.4.1
+
diff --git a/app-misc/ddccontrol/files/ddccontrol-0.4.2-no-ddcpci.patch b/app-misc/ddccontrol/files/ddccontrol-0.4.2-no-ddcpci.patch
new file mode 100644
index 000000000000..5ecb90f12a82
--- /dev/null
+++ b/app-misc/ddccontrol/files/ddccontrol-0.4.2-no-ddcpci.patch
@@ -0,0 +1,14 @@
+fix building when ddcpci is disabled.  just a hack while we sort
+out the real fix upstream.
+
+--- a/src/gddccontrol/main.c
++++ b/src/gddccontrol/main.c
+@@ -24,7 +24,7 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ 
+-#include "ddcpci-ipc.h"
++#define IDLE_TIMEOUT 60
+ 
+ #include "notebook.h"
+ 
diff --git a/app-misc/ddccontrol/metadata.xml b/app-misc/ddccontrol/metadata.xml
index 2b6ad1725fe6..e789b82e86e9 100644
--- a/app-misc/ddccontrol/metadata.xml
+++ b/app-misc/ddccontrol/metadata.xml
@@ -11,4 +11,7 @@
 		and ddccontrol-db.
 	</description>
 </maintainer>
+<use>
+ <flag name='ddcpci'>enable direct PCI memory access (the setuid ddcpci util)</flag>
+</use>
 </pkgmetadata>