[gentoo-commits] gentoo-x86 commit in app-laptop/i8kutils: ChangeLog i8kutils-1.25.ebuild i8kutils-1.25-r1.ebuild i8kutils-1.33.ebuild

[Justin Lecher (jlec)]

jlec        12/07/01 11:03:09

  Modified:             ChangeLog i8kutils-1.25.ebuild
                        i8kutils-1.25-r1.ebuild
  Added:                i8kutils-1.33.ebuild
  Log:
  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
  
  (Portage version: 2.2.0_alpha114/cvs/Linux x86_64)

Revision  Changes    Path
1.19                 app-laptop/i8kutils/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-laptop/i8kutils/ChangeLog?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-laptop/i8kutils/ChangeLog?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-laptop/i8kutils/ChangeLog?r1=1.18&r2=1.19

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-laptop/i8kutils/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ChangeLog	1 Jul 2012 10:42:49 -0000	1.18
+++ ChangeLog	1 Jul 2012 11:03:09 -0000	1.19
@@ -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@g.o> 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@g.o> 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@g.o> i8kutils-1.25.ebuild,



1.14                 app-laptop/i8kutils/i8kutils-1.25.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-laptop/i8kutils/i8kutils-1.25.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-laptop/i8kutils/i8kutils-1.25.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-laptop/i8kutils/i8kutils-1.25.ebuild?r1=1.13&r2=1.14

Index: i8kutils-1.25.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-laptop/i8kutils/i8kutils-1.25.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- i8kutils-1.25.ebuild	1 Jan 2010 21:09:43 -0000	1.13
+++ i8kutils-1.25.ebuild	1 Jul 2012 11:03:09 -0000	1.14
@@ -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 @@
 	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
 
 }



1.4                  app-laptop/i8kutils/i8kutils-1.25-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-laptop/i8kutils/i8kutils-1.25-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-laptop/i8kutils/i8kutils-1.25-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-laptop/i8kutils/i8kutils-1.25-r1.ebuild?r1=1.3&r2=1.4

Index: i8kutils-1.25-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-laptop/i8kutils/i8kutils-1.25-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- i8kutils-1.25-r1.ebuild	1 Jan 2010 21:09:43 -0000	1.3
+++ i8kutils-1.25-r1.ebuild	1 Jul 2012 11:03:09 -0000	1.4
@@ -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 @@
 	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
 
 }



1.1                  app-laptop/i8kutils/i8kutils-1.33.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-laptop/i8kutils/i8kutils-1.33.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-laptop/i8kutils/i8kutils-1.33.ebuild?rev=1.1&content-type=text/plain

Index: i8kutils-1.33.ebuild
===================================================================
# 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

}