Another revision bump, seems my initial intention (the one in #152096) wasn't that good. Reverting my changes. Furthermore, seems like I missed to add automake to the DEPEND, #152290 (thanks to t35t0r <t35t0r at gmail.com>).

Package-Manager: portage-2.1.2_pre3-r5

4 files changed, 18 insertions, 115 deletions

diff --git a/sys-power/cpufreqd/Manifest b/sys-power/cpufreqd/Manifest
index 4e04aade23c1..78ce1bba21c9 100644
--- a/sys-power/cpufreqd/Manifest
+++ b/sys-power/cpufreqd/Manifest
@@ -13,14 +13,10 @@ AUX cpufreqd-2.1.1-init.d 914 RMD160 a0edb5d6151a14bc91b427912a88c888f4ac4b91 SH
 MD5 ca0fa6db77839fe6855623217979b547 files/cpufreqd-2.1.1-init.d 914
 RMD160 a0edb5d6151a14bc91b427912a88c888f4ac4b91 files/cpufreqd-2.1.1-init.d 914
 SHA256 bb7dc7bebaf3b8adb942903f78624836dd93d7c8a34764767a5c0d5a30fa53e5 files/cpufreqd-2.1.1-init.d 914
-AUX cpufreqd-2.2.0-Makefile.am.patch 621 RMD160 da93043100a8c86de526f4452e2f4eef6dab5049 SHA1 1ceae958633b811de90e0376112dc69f9d3488aa SHA256 225ba9eab18a54bc1371c185514ebde383b68644cb3f1c55ffd3cdf785b1f133
-MD5 07e5b9d4c5cb0d4a85e39b2849cc8edc files/cpufreqd-2.2.0-Makefile.am.patch 621
-RMD160 da93043100a8c86de526f4452e2f4eef6dab5049 files/cpufreqd-2.2.0-Makefile.am.patch 621
-SHA256 225ba9eab18a54bc1371c185514ebde383b68644cb3f1c55ffd3cdf785b1f133 files/cpufreqd-2.2.0-Makefile.am.patch 621
-AUX cpufreqd-2.2.0-init.d 995 RMD160 192eb07785fc0b7965c34a426e0a3ae6749782d2 SHA1 b0458288513eca4726ef21e662c2bb0f6f75e184 SHA256 1627217a80be2d5d901700ea8e19a19fdf1dd6caa75558480912a0f8ae9e320f
-MD5 63e873de04e7e7e2c86faff6194bb00e files/cpufreqd-2.2.0-init.d 995
-RMD160 192eb07785fc0b7965c34a426e0a3ae6749782d2 files/cpufreqd-2.2.0-init.d 995
-SHA256 1627217a80be2d5d901700ea8e19a19fdf1dd6caa75558480912a0f8ae9e320f files/cpufreqd-2.2.0-init.d 995
+AUX cpufreqd-2.2.0-init.d 1105 RMD160 1bb0521d333a9dec4fdd2f1c26109bbf9b7533d3 SHA1 93cadaa826a7393a9f352c02c8ec9f65ae268d19 SHA256 2209cf8e3ae55444b0c5937e1aaf0d1f6a3504372c259cdced1de953437c98f9
+MD5 91ff4ba1556247dec515c9c6cddb6a5a files/cpufreqd-2.2.0-init.d 1105
+RMD160 1bb0521d333a9dec4fdd2f1c26109bbf9b7533d3 files/cpufreqd-2.2.0-init.d 1105
+SHA256 2209cf8e3ae55444b0c5937e1aaf0d1f6a3504372c259cdced1de953437c98f9 files/cpufreqd-2.2.0-init.d 1105
 AUX nvclock0.8b-fd.patch 580 RMD160 a5db5cb4f0c0f3270e3f042b1033defd6c406376 SHA1 afd021a0144b6adb4dbb936f1a8181db609592fc SHA256 5dad49a3ce2a52b37c4711c497a46c373282bdf27b9b28834a0b5bd977066bf2
 MD5 786c62ca107cb9bc4e67e4cc2af34409 files/nvclock0.8b-fd.patch 580
 RMD160 a5db5cb4f0c0f3270e3f042b1033defd6c406376 files/nvclock0.8b-fd.patch 580
@@ -55,14 +51,14 @@ EBUILD cpufreqd-2.1.1.ebuild 1629 RMD160 bf3cfa86e97657e47fbe9a7345f6a6f5242c2fc
 MD5 39d6f17ee0072369331f8f70b2627b61 cpufreqd-2.1.1.ebuild 1629
 RMD160 bf3cfa86e97657e47fbe9a7345f6a6f5242c2fc5 cpufreqd-2.1.1.ebuild 1629
 SHA256 8c6b92d681f3b0fd85168400d89b56cdccda7326f7ed1e4f8807efcb20c31f1d cpufreqd-2.1.1.ebuild 1629
-EBUILD cpufreqd-2.2.0-r1.ebuild 1658 RMD160 75141478624017cd5a5c7759e3950e0c3596c55c SHA1 cef9320eb660d9295385791003c89bdcadb4fb9f SHA256 5c38af20728158530847387ed827d4c86c8054dff709d2fd54b555b7223bb2de
-MD5 97556758cb53ed8875f79d026b492b0c cpufreqd-2.2.0-r1.ebuild 1658
-RMD160 75141478624017cd5a5c7759e3950e0c3596c55c cpufreqd-2.2.0-r1.ebuild 1658
-SHA256 5c38af20728158530847387ed827d4c86c8054dff709d2fd54b555b7223bb2de cpufreqd-2.2.0-r1.ebuild 1658
-MISC ChangeLog 9362 RMD160 72010fb5539b0ae6b3e8840081da4c2cf5c57ea9 SHA1 cbfd798afd6c6249660f8c321977b5579270bde6 SHA256 844ac3ec04b4bbf566273250c5147d6dbce390f8e7085435c9a82d9c703757e5
-MD5 57cf2710acc37d185301440e2b975176 ChangeLog 9362
-RMD160 72010fb5539b0ae6b3e8840081da4c2cf5c57ea9 ChangeLog 9362
-SHA256 844ac3ec04b4bbf566273250c5147d6dbce390f8e7085435c9a82d9c703757e5 ChangeLog 9362
+EBUILD cpufreqd-2.2.0-r2.ebuild 1880 RMD160 a4ea5996f45759439b9b664abb03e4a6f8988858 SHA1 2900004f1c629fe32bf0fdd149914e2e14b9312f SHA256 db0380c85d141703194230201ef08454a729a658f6e5cd78abe9ef9bee767c98
+MD5 5e92b3fb1708a86b229992ce82d11a99 cpufreqd-2.2.0-r2.ebuild 1880
+RMD160 a4ea5996f45759439b9b664abb03e4a6f8988858 cpufreqd-2.2.0-r2.ebuild 1880
+SHA256 db0380c85d141703194230201ef08454a729a658f6e5cd78abe9ef9bee767c98 cpufreqd-2.2.0-r2.ebuild 1880
+MISC ChangeLog 9808 RMD160 2c72169d2cf3e511810c3126ae47cdd9fec3b2e8 SHA1 85bb8da4e17480665b1ef990738e75f8ea098ccb SHA256 271e1cccbe19f0a85731011534cc0d4c9822b9dfc0fe953775eb6a0553dbc1fb
+MD5 f9dd2415aab9602c2d186c76b08aa127 ChangeLog 9808
+RMD160 2c72169d2cf3e511810c3126ae47cdd9fec3b2e8 ChangeLog 9808
+SHA256 271e1cccbe19f0a85731011534cc0d4c9822b9dfc0fe953775eb6a0553dbc1fb ChangeLog 9808
 MISC metadata.xml 254 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f SHA1 653c702fdb89577e9d15e9cbca3891e4acdba061 SHA256 9bffc4ff1cf574848699e33b09ff0f6137d6b64b69d82c7b95cafb32ee75becb
 MD5 f3e68295a919220f58e91a1d3468c851 metadata.xml 254
 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f metadata.xml 254
@@ -79,13 +75,13 @@ SHA256 d0070d2db2de2754c0bf6fd5fd9ece5c5a0081886253b8ab56dbdaf2e9c9dbeb files/di
 MD5 b60f240c0551bd5c19a5bcef73d57319 files/digest-cpufreqd-2.1.1 482
 RMD160 468018e88c4786887c320f992b3ac410e06d1073 files/digest-cpufreqd-2.1.1 482
 SHA256 d4e8e35e673798e45c2eed31d735c475a39515027864a796e387df7210d18942 files/digest-cpufreqd-2.1.1 482
-MD5 2bf021953099bfb20f6a6d71a6a9e2d9 files/digest-cpufreqd-2.2.0-r1 482
-RMD160 7aa959463eae588a3f8737b217c07e66f6e82b4f files/digest-cpufreqd-2.2.0-r1 482
-SHA256 ece8527560ea346e55eca1f480239b7744db81a6c842424e08a86af247f6b411 files/digest-cpufreqd-2.2.0-r1 482
+MD5 2bf021953099bfb20f6a6d71a6a9e2d9 files/digest-cpufreqd-2.2.0-r2 482
+RMD160 7aa959463eae588a3f8737b217c07e66f6e82b4f files/digest-cpufreqd-2.2.0-r2 482
+SHA256 ece8527560ea346e55eca1f480239b7744db81a6c842424e08a86af247f6b411 files/digest-cpufreqd-2.2.0-r2 482
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFOSfeyuNVb5qfaOYRAtNrAJwMLByyqYRMCw/PKS3io+I6t0ms0QCfb+yr
-KQocBRezOsQ5md21JVaS6sc=
-=mub/
+iD8DBQFFOyriyuNVb5qfaOYRAiuCAKCoKhrkKrs95xhip1hWLjGyvGq+MgCfRMTL
+KrQnc/KEyReTYd6zhLN5o1E=
+=DPsX
 -----END PGP SIGNATURE-----
diff --git a/sys-power/cpufreqd/cpufreqd-2.2.0-r1.ebuild b/sys-power/cpufreqd/cpufreqd-2.2.0-r1.ebuild
deleted file mode 100644
index 6b7e421a4071..000000000000
--- a/sys-power/cpufreqd/cpufreqd-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/cpufreqd-2.2.0-r1.ebuild,v 1.1 2006/10/20 19:47:34 phreak Exp $
-
-inherit eutils autotools
-
-NVCLOCK_VERSION="0.8b"
-
-DESCRIPTION="CPU Frequency Daemon"
-HOMEPAGE="http://cpufreqd.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-		nvidia? ( http://www.linuxhardware.org/nvclock/nvclock${NVCLOCK_VERSION}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-IUSE="acpi apm lm_sensors nforce2 nvidia pmu"
-RDEPEND=">=sys-power/cpufrequtils-002
-		lm_sensors? ( sys-apps/lm_sensors )"
-DEPEND="sys-apps/sed
-		${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-Makefile.am.patch
-	eautomake
-
-	sed -i -e "s:acpi_event:acpi:" "${S}"/cpufreqd.conf
-
-	if use nvidia; then
-		cd "${WORKDIR}"/nvclock${NVCLOCK_VERSION}
-		epatch "${FILESDIR}"/nvclock${NVCLOCK_VERSION}-fpic.patch
-	fi
-}
-
-src_compile() {
-	local config
-
-	if use nvidia; then
-		cd "${WORKDIR}"/nvclock${NVCLOCK_VERSION}
-		econf \
-			--disable-gtk \
-			--disable-qt \
-			--disable-nvcontrol \
-			|| die "econf nvclock failed"
-		emake -j1 || die "emake nvclock failed"
-		config="--enable-nvclock=${WORKDIR}/nvclock${NVCLOCK_VERSION}"
-	fi
-
-	cd "${S}"
-	econf \
-		$(use_enable acpi) \
-		$(use_enable apm) \
-		$(use_enable lm_sensors sensors) \
-		$(use_enable nforce2) \
-		$(use_enable pmu) \
-		${config} \
-		|| die "econf failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	newinitd "${FILESDIR}"/${P}-init.d ${PN}
-}
diff --git a/sys-power/cpufreqd/files/cpufreqd-2.2.0-Makefile.am.patch b/sys-power/cpufreqd/files/cpufreqd-2.2.0-Makefile.am.patch
deleted file mode 100644
index 4033bac3ab35..000000000000
--- a/sys-power/cpufreqd/files/cpufreqd-2.2.0-Makefile.am.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: cpufreqd-2.2.0/Makefile.am
-===================================================================
---- cpufreqd-2.2.0.orig/Makefile.am
-+++ cpufreqd-2.2.0/Makefile.am
-@@ -22,11 +22,7 @@ SUBDIRS = src utils manpages
- #man5_MANS = manpages/cpufreqd.conf.5
- 
- install-data-local:
--	if [ -f $(DESTDIR)/$(sysconfdir)/cpufreqd.conf ]; then \
--	 echo "** preserving old configuration file **"; \
--	else \
--	 install -Dm 0644 $(top_srcdir)/cpufreqd.conf $(DESTDIR)/$(sysconfdir)/cpufreqd.conf; \
--	fi;
-+	 install -Dm 0644 $(top_srcdir)/cpufreqd.conf $(DESTDIR)/$(sysconfdir)/conf.d/cpufreqd
- 
- tags:
- 	if [ -f ./tags ]; then \
diff --git a/sys-power/cpufreqd/files/digest-cpufreqd-2.2.0-r1 b/sys-power/cpufreqd/files/digest-cpufreqd-2.2.0-r1
deleted file mode 100644
index 928d8acc56d6..000000000000
--- a/sys-power/cpufreqd/files/digest-cpufreqd-2.2.0-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 a8916004d3fb75ed43822eb978c08fc5 cpufreqd-2.2.0.tar.bz2 292219
-RMD160 2e61db9bac593ae564e5103c80b4c49b9a85011c cpufreqd-2.2.0.tar.bz2 292219
-SHA256 13b857d23dff773965eb03a1531e6265627c328d5cc448ec4d446a7c54348d3b cpufreqd-2.2.0.tar.bz2 292219
-MD5 df36711124e08b3349692a8788755d14 nvclock0.8b.tar.gz 353127
-RMD160 66cac5993dc141d00efaa95d8f5ec38ed53854f6 nvclock0.8b.tar.gz 353127
-SHA256 a1fbdb82837c33869c0ebfcb95b6e11fc53b86919e8d1d17265d1af71eb04393 nvclock0.8b.tar.gz 353127