Remove old ebuilds and files, version bump to newest beta, cmake-utils, USE flags for atasmart.

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

7 files changed, 63 insertions, 116 deletions

diff --git a/app-laptop/thinkfan/ChangeLog b/app-laptop/thinkfan/ChangeLog
index 14a3ffd0a8f1..764bc947f51f 100644
--- a/app-laptop/thinkfan/ChangeLog
+++ b/app-laptop/thinkfan/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-laptop/thinkfan
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkfan/ChangeLog,v 1.12 2013/02/04 13:18:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkfan/ChangeLog,v 1.13 2013/02/12 19:52:39 xmw Exp $
+
+*thinkfan-0.9_beta2 (12 Feb 2013)
+
+  12 Feb 2013; Michael Weber <xmw@gentoo.org>
+  -files/thinkfan-0.7.3-makefile.patch, -files/thinkfan-0.7.3-openrc.patch,
+  -thinkfan-0.8.0.ebuild, -thinkfan-0.8.1.ebuild, +thinkfan-0.9_beta2.ebuild,
+  metadata.xml:
+  Remove old ebuilds and files, version bump to newest beta, cmake-utils, USE
+  flags for atasmart.
 
   04 Feb 2013; Agostino Sarubbo <ago@gentoo.org> thinkfan-0.8.1-r1.ebuild:
   Stable for x86, wrt bug #455402
diff --git a/app-laptop/thinkfan/files/thinkfan-0.7.3-makefile.patch b/app-laptop/thinkfan/files/thinkfan-0.7.3-makefile.patch
deleted file mode 100644
index fac489464079..000000000000
--- a/app-laptop/thinkfan/files/thinkfan-0.7.3-makefile.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- thinkfan-0.7.3/Makefile
-+++ thinkfan-0.7.3/Makefile
-@@ -1,20 +1,12 @@
- .DEFAULT_GOAL := thinkfan
- 
--thinkfan:	system.o parser.o config.o thinkfan.o message.o
--			gcc $(CFLAGS) -Wall -o thinkfan system.o config.o parser.o \
--			thinkfan.o message.o
--
--message.o:	message.c globaldefs.h
--			gcc $(CFLAGS) -Wall -c message.c
-+CC ?= gcc
- 
--system.o:	system.c system.h message.h globaldefs.h parser.h
--			gcc $(CFLAGS) -Wall -c system.c
--
--config.o:	config.c config.h message.h globaldefs.h system.h parser.h
--			gcc $(CFLAGS) -Wall -c config.c
-+thinkfan:	system.o parser.o config.o thinkfan.o message.o
-+		$(CC) $(LDFLAGS) -Wall -o $@ $^
- 
--thinkfan.o:	thinkfan.c thinkfan.h message.h globaldefs.h config.h
--			gcc $(CFLAGS) -Wall -c thinkfan.c
-+%.o:	%.c
-+		$(CC) $(CFLAGS) -Wall -c -o $@ $<
- 
- clean:
- 		rm -rf *.o thinkfan
diff --git a/app-laptop/thinkfan/files/thinkfan-0.7.3-openrc.patch b/app-laptop/thinkfan/files/thinkfan-0.7.3-openrc.patch
deleted file mode 100644
index 3ef027653cf9..000000000000
--- a/app-laptop/thinkfan/files/thinkfan-0.7.3-openrc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- thinkfan-0.7.3/rcscripts/thinkfan.gentoo
-+++ thinkfan-0.7.3/rcscripts/thinkfan.gentoo
-@@ -3,7 +3,7 @@
- # Distributed under the terms of the GNU General Public License v2
- # $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkfan/files/thinkfan-0.7.3-openrc.patch,v 1.1 2012/02/13 02:27:51 xmw Exp $
- 
--opts="reload"
-+extra_started_commands="reload"
- 
- depend() {
- 	after modules
diff --git a/app-laptop/thinkfan/metadata.xml b/app-laptop/thinkfan/metadata.xml
index 59acc2cc580e..14e5623b5904 100644
--- a/app-laptop/thinkfan/metadata.xml
+++ b/app-laptop/thinkfan/metadata.xml
@@ -5,5 +5,8 @@
 <email>xmw@gentoo.org</email>
 <name>Michael Weber</name>
 </maintainer>
+<use>
+	<flag name="atasmart">include libatasmart support to get disc temperature</flag>
+</use>
 </pkgmetadata>
 
diff --git a/app-laptop/thinkfan/thinkfan-0.8.0.ebuild b/app-laptop/thinkfan/thinkfan-0.8.0.ebuild
deleted file mode 100644
index 7a18673aa80a..000000000000
--- a/app-laptop/thinkfan/thinkfan-0.8.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkfan/thinkfan-0.8.0.ebuild,v 1.3 2012/06/20 06:42:06 jdhore Exp $
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="simple fan control program for thinkpads"
-HOMEPAGE="http://thinkfan.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	tc-export CC
-}
-
-src_install() {
-	dosbin ${PN}
-
-	newinitd rcscripts/thinkfan.gentoo ${PN}
-
-	doman ${PN}.1
-	dodoc ChangeLog NEWS README \
-		examples/${PN}.conf.{complex,sysfs,thinkpad}
-}
-
-pkg_postinst() {
-	elog "Please read the documentation and copy an"
-	elog "appropriate file to /etc/thinkfan.conf."
-}
diff --git a/app-laptop/thinkfan/thinkfan-0.8.1.ebuild b/app-laptop/thinkfan/thinkfan-0.8.1.ebuild
deleted file mode 100644
index 55cb52812677..000000000000
--- a/app-laptop/thinkfan/thinkfan-0.8.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkfan/thinkfan-0.8.1.ebuild,v 1.1 2012/10/06 09:46:11 xmw Exp $
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="simple fan control program for thinkpads"
-HOMEPAGE="http://thinkfan.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	tc-export CC
-}
-
-src_install() {
-	dosbin ${PN}
-
-	newinitd rcscripts/thinkfan.gentoo ${PN}
-
-	doman ${PN}.1
-	dodoc ChangeLog NEWS README \
-		examples/${PN}.conf.{complex,sysfs,thinkpad}
-}
-
-pkg_postinst() {
-	elog "Please read the documentation and copy an"
-	elog "appropriate file to /etc/thinkfan.conf."
-}
diff --git a/app-laptop/thinkfan/thinkfan-0.9_beta2.ebuild b/app-laptop/thinkfan/thinkfan-0.9_beta2.ebuild
new file mode 100644
index 000000000000..56e4729650fb
--- /dev/null
+++ b/app-laptop/thinkfan/thinkfan-0.9_beta2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkfan/thinkfan-0.9_beta2.ebuild,v 1.1 2013/02/12 19:52:39 xmw Exp $
+
+EAPI=4
+
+inherit cmake-utils systemd
+
+DESCRIPTION="simple fan control program for thinkpads"
+HOMEPAGE="http://thinkfan.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="atasmart systemd"
+
+DEPEND="dev-libs/libatasmart"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.8.1-openrc.patch
+	sed -e '/^set(CMAKE_C_FLAGS/d' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	mycmakeargs+=(
+		"-DCMAKE_BUILD_TYPE:STRING=Debug"
+		"$(cmake-utils_use_use atasmart ATASMART)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	dosbin "${BUILD_DIR}"/${PN}
+
+	newinitd rcscripts/${PN}.gentoo ${PN}
+	systemd_dounit rcscripts/${PN}.service
+
+	doman ${PN}.1
+	dodoc ChangeLog NEWS README \
+		examples/${PN}.conf.{complex,simple}
+}
+
+pkg_postinst() {
+	elog "Please read the documentation and copy an"
+	elog "appropriate file to /etc/thinkfan.conf."
+}