app-laptop/i8kutils: Version BUmp, Correct HOMEPAGE, correct SRC_URI; respect CFLAGS, #240015; respect LDFLAGS, #337349; respect CC, #243602; handle examples installation through USE; move to EAPI=4

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

5 files changed, 112 insertions, 32 deletions

diff --git a/app-laptop/i8kutils/ChangeLog b/app-laptop/i8kutils/ChangeLog
index 69284364b08b..dcebb564b174 100644
--- a/app-laptop/i8kutils/ChangeLog
+++ b/app-laptop/i8kutils/ChangeLog
@@ -1,10 +1,17 @@
 # ChangeLog for app-laptop/i8kutils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/i8kutils/ChangeLog,v 1.18 2012/07/01 10:42:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/i8kutils/ChangeLog,v 1.19 2012/07/01 11:03:09 jlec Exp $
+
+*i8kutils-1.33 (01 Jul 2012)
+
+  01 Jul 2012; Justin Lecher <jlec@gentoo.org> i8kutils-1.25.ebuild,
+  i8kutils-1.25-r1.ebuild, +i8kutils-1.33.ebuild:
+  Version BUmp, Correct HOMEPAGE, correct SRC_URI; respect CFLAGS, #240015;
+  respect LDFLAGS, #337349; respect CC, #243602; handle examples installation
+  through USE; move to EAPI=4
 
   01 Jul 2012; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Fix up metadata.xml. If there's no maintainer for the package, the metadata
-
   also needs to contain m-needed@g.o.
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> i8kutils-1.25.ebuild,
diff --git a/app-laptop/i8kutils/Manifest b/app-laptop/i8kutils/Manifest
index e6437898671b..7b200d1c5a4a 100644
--- a/app-laptop/i8kutils/Manifest
+++ b/app-laptop/i8kutils/Manifest
@@ -5,15 +5,17 @@ AUX i8k.conf 891 RMD160 0331ff37c0c083315d91e459247399c096adc695 SHA1 b532f1ab97
 AUX i8k.init 1161 RMD160 b7bb1c1a4d1bddd562df09cdac64c4c427dda419 SHA1 8a0d094264b6e63ec6bf26b8636f8875da22ea4b SHA256 67c4114d6f6ac5cf8c4bfb10a65e523ef54119b58b61f44dcd893eb2c5cc2153
 AUX i8k.init-r1 1215 RMD160 107bd00f11558e6450851c205bba0626402216fd SHA1 3ec4db22d1dc2d9ee96f5f05603d67a956fcd74d SHA256 78b572be1fff67fadea425ce250ddb4e0ea577be00d825ca465aba8ea4c7c3e5
 DIST i8kutils_1.25.tar.gz 40528 RMD160 45a45afb2c5528b30864226a5f29c3af2824107f SHA1 f75b117e67242ded9b2936add0e947b6b6dbd976 SHA256 30bd138f31e3632e35472c012732a74c7dac5a87708fd7b24f323a0ca7c71ca4
-EBUILD i8kutils-1.25-r1.ebuild 1032 RMD160 228d2cf383e87c1a584bc213b92bf51240c8dc07 SHA1 a3077d0b4a8dac78196f35bbabd31f3d0de6dafb SHA256 538f9db7560f33fd7d7f55d1b1341d52a1a09a55dfafe7cc42dae22bfc03be63
-EBUILD i8kutils-1.25.ebuild 1025 RMD160 82bc5d0a27b81de92af9e5275933140bb6cc9911 SHA1 48e2a93d04cacd2dcdd636cd4f692506d11c40d1 SHA256 4e240eedf06a1c410583d682a33ba051745c12b7aa36e9c6e77325cb00d3cd95
-MISC ChangeLog 2728 RMD160 dff2072adbb18d16b968a3409137ed521391b6d8 SHA1 f0b2b7ef569548cb85dc03a06f7294cd9a080478 SHA256 3fcbf0caa96a4daad164e2373052db458f517936798631197e4322488012a43c
+DIST i8kutils_1.33.tar.gz 50378 RMD160 b4d11ca8951166f9f3777edbc87fdd394b8017ba SHA1 2701697dfe9c0e351cb412badd14fbf8191838c3 SHA256 ebdd39a2be8b5742bd7b24a5dbcbef36ab3b9980330ad07eea471e68b800ecd7
+EBUILD i8kutils-1.25-r1.ebuild 1162 RMD160 2aae098026d2b93bc8f729bc110b05f81f02643b SHA1 5377508cf4efeee7c9c319d707bfd49d6512a012 SHA256 0681141e689ce01414ae45d9f625130f06946ae8d3d476cef76722b53780af82
+EBUILD i8kutils-1.25.ebuild 1055 RMD160 90836343c7f0583d7a3f2b173eecf9da12e8b1a3 SHA1 f412899bed462c923889441708d8eef392735027 SHA256 288301e5cc7529af0716c2f3aba57bd1fe13d6f8c0def5f897a10f5d18a73bf0
+EBUILD i8kutils-1.33.ebuild 1124 RMD160 9a51f008f9dc7f100a07c6d3270fa11d61421938 SHA1 fd8c721cf338f1176236b93d79982bc1aad3204c SHA256 f987e2da429edd2e6a7441d6eea0687f3b1d9d8c474d7611014e243394c07cad
+MISC ChangeLog 3061 RMD160 a316a9ae56c4723ad3163a3ce83dd63404bc8369 SHA1 d1231eb9524e85d7e404213b2222e680dac1c9df SHA256 b3c0d923cfbcb9b7a8fdf520c35ef1a9c0fab3229e56b4f11733ee6443fb80c7
 MISC metadata.xml 268 RMD160 01696164cd82ae0617304a419940adecf5a9d222 SHA1 b52a9b90dd049bc8749bc0d25cdfddebd447860f SHA256 2089ca59285b2836a6ec1d5aef27f83d580e922212301f0b1eadb04400eb45eb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk/wKa4ACgkQgAnW8HDreRaopQCfQrRca2TMyOY1RZro/m/INk5k
-+38AnRN1EgUmgGOHgUTCiZ4cK/HozYPE
-=iJdE
+iEYEAREKAAYFAk/wLnMACgkQgAnW8HDreRbhVQCfa5nk1qV7rFe2+pfWSPa1iUqA
+xI4AoLEsk0a5VHCEN+1AHMx4FSkxPmt8
+=Vg7M
 -----END PGP SIGNATURE-----
diff --git a/app-laptop/i8kutils/i8kutils-1.25-r1.ebuild b/app-laptop/i8kutils/i8kutils-1.25-r1.ebuild
index 4767f0cbe02b..0b196effe7bc 100644
--- a/app-laptop/i8kutils/i8kutils-1.25-r1.ebuild
+++ b/app-laptop/i8kutils/i8kutils-1.25-r1.ebuild
@@ -1,17 +1,34 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/i8kutils/i8kutils-1.25-r1.ebuild,v 1.3 2010/01/01 21:09:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/i8kutils/i8kutils-1.25-r1.ebuild,v 1.4 2012/07/01 11:03:09 jlec Exp $
+
+EAPI=4
+
+inherit toolchain-funcs
 
 DESCRIPTION="Dell Inspiron and Latitude utilities"
-HOMEPAGE="http://people.debian.org/~dz/i8k/"
+HOMEPAGE="http://packages.debian.org/sid/i8kutils"
 SRC_URI="http://people.debian.org/~dz/i8k/${P/-/_}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="tk"
+IUSE="examples tk"
+
+DEPEND="tk? ( dev-lang/tk )"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.i8kutils )
 
-DEPEND="tk? ( >=dev-lang/tk-8.3.3 )"
+src_prepare() {
+	sed \
+		-e '/^CC/d' \
+		-e '/^CFLAGS/d' \
+		-e 's: -g : $(LDFLAGS) :g' \
+		-i Makefile || die
+
+	tc-export CC
+}
 
 src_compile() {
 	make all || die
@@ -21,23 +38,21 @@ src_install() {
 	dobin i8kbuttons i8kctl
 	doman i8kbuttons.1 i8kctl.1
 	dosym /usr/bin/i8kctl /usr/bin/i8kfan
-	dodoc README.i8kutils
-	docinto examples/
-	dodoc examples/*
+
+	use examples && dodoc -r examples
 
 	newinitd "${FILESDIR}"/i8k.init-r1 i8k
 	newconfd "${FILESDIR}"/i8k.conf i8k
 
-	if use tk
-	then
+	if use tk; then
 		dobin i8kmon
 		doman i8kmon.1
-		docinto /
 		dodoc i8kmon.conf
 	else
-		echo >> ${D}/etc/conf.d/i8k
-		echo '# i8kmon disabled because the package was installed without USE=tk' >> ${D}/etc/conf.d/i8k
-		echo 'NOMON=1' >> ${D}/etc/conf.d/i8k
+		cat >> "${ED}"/etc/conf.d/i8k <<- EOF
+		# i8kmon disabled because the package was installed without USE=tk
+		NOMON=1
+		EOF
 	fi
 
 }
diff --git a/app-laptop/i8kutils/i8kutils-1.25.ebuild b/app-laptop/i8kutils/i8kutils-1.25.ebuild
index de500093eda4..3e308560b71c 100644
--- a/app-laptop/i8kutils/i8kutils-1.25.ebuild
+++ b/app-laptop/i8kutils/i8kutils-1.25.ebuild
@@ -1,17 +1,20 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/i8kutils/i8kutils-1.25.ebuild,v 1.13 2010/01/01 21:09:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/i8kutils/i8kutils-1.25.ebuild,v 1.14 2012/07/01 11:03:09 jlec Exp $
+
+EAPI=4
 
 DESCRIPTION="Dell Inspiron and Latitude utilities"
-HOMEPAGE="http://people.debian.org/~dz/i8k/"
+HOMEPAGE="http://packages.debian.org/sid/i8kutils"
 SRC_URI="http://people.debian.org/~dz/i8k/${P/-/_}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* x86 amd64"
+KEYWORDS="-* amd64 x86"
 IUSE="tk"
 
-DEPEND="tk? ( >=dev-lang/tk-8.3.3 )"
+DEPEND="tk? ( dev-lang/tk )"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	make all || die
@@ -28,16 +31,15 @@ src_install() {
 	newinitd "${FILESDIR}"/i8k.init i8k
 	newconfd "${FILESDIR}"/i8k.conf i8k
 
-	if use tk
-	then
+	if use tk; then
 		dobin i8kmon
 		doman i8kmon.1
 		docinto /
 		dodoc i8kmon.conf
 	else
-		echo >> ${D}/etc/conf.d/i8k
-		echo '# i8kmon disabled because the package was installed without USE=tk' >> ${D}/etc/conf.d/i8k
-		echo 'NOMON=1' >> ${D}/etc/conf.d/i8k
+		echo >> "${ED}"/etc/conf.d/i8k
+		echo '# i8kmon disabled because the package was installed without USE=tk' >> "${ED}"/etc/conf.d/i8k
+		echo 'NOMON=1' >> "${ED}"/etc/conf.d/i8k
 	fi
 
 }
diff --git a/app-laptop/i8kutils/i8kutils-1.33.ebuild b/app-laptop/i8kutils/i8kutils-1.33.ebuild
new file mode 100644
index 000000000000..22e598a95f3d
--- /dev/null
+++ b/app-laptop/i8kutils/i8kutils-1.33.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/i8kutils/i8kutils-1.33.ebuild,v 1.1 2012/07/01 11:03:09 jlec Exp $
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="Dell Inspiron and Latitude utilities"
+HOMEPAGE="http://packages.debian.org/sid/i8kutils"
+SRC_URI="mirror://debian/pool/main/i/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="examples tk"
+
+DEPEND="tk? ( dev-lang/tk )"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.i8kutils )
+
+src_prepare() {
+	sed \
+		-e '/^CC/d' \
+		-e '/^CFLAGS/d' \
+		-e 's: -g : $(LDFLAGS) :g' \
+		-i Makefile || die
+
+	tc-export CC
+}
+
+src_install() {
+	dobin i8kbuttons i8kctl
+	doman i8kbuttons.1 i8kctl.1
+	dosym /usr/bin/i8kctl /usr/bin/i8kfan
+
+	use examples && dodoc -r examples
+
+	newinitd "${FILESDIR}"/i8k.init-r1 i8k
+	newconfd "${FILESDIR}"/i8k.conf i8k
+
+	if use tk; then
+		dobin i8kmon
+		doman i8kmon.1
+		dodoc i8kmon.conf
+	else
+		cat >> "${ED}"/etc/conf.d/i8k <<- EOF
+		# i8kmon disabled because the package was installed without USE=tk
+		NOMON=1
+		EOF
+	fi
+
+}