gentoo resync : 30.12.2017

4 files changed, 31 insertions, 36 deletions

diff --git a/app-admin/longrun/Manifest b/app-admin/longrun/Manifest
index 4eb6e728b1c9..016068bc56a5 100644
--- a/app-admin/longrun/Manifest
+++ b/app-admin/longrun/Manifest
@@ -1,6 +1,6 @@
-AUX 0.9-makefile_cflags.patch 577 BLAKE2B 65c3109ca5b6e89fa9000fd7321a456db18e7cf667273574eaf4fd69b153f280d3eb6eceb92bb8fb5b0a580b7448a4f858ae4c29a0aaeadfa7d0daed674c1c17 SHA512 a461d9fc0b1a0d7aa2f36c02d5121b2a8e433b7254f08e53a6a8b8a7cc0ad25bb707a80b6d07148543b74aa78696868583e1004a64c631694eef85c787cdd051
+AUX 0.9-makefile_cflags.patch 305 BLAKE2B 7b2c0df4162b44c723286b86f1cdff3de6761def2139d737c3dc7ac754b6e8b9f5674528a12334316fbc922f4b9d961d2e53e0e7c085f69a16952395feaef36e SHA512 3aaf8b9a21364264734de21505a5c2e5327bc443a25e26db55af87b49bec6b9a767bce9abdcf24ee0af2e43579460a36caaffa1d6d57b7420192685194f4979d
 AUX 0.9-replace-loff_t.patch 992 BLAKE2B 81c94054ba9ab75cd6c9f71e10c78b6f921695e9b0273aa35a394bade52d1183e588a3a5c8b894c1c16cf5c3c620f1777ab56e591fdb68ed6e70927c4aa89f2c SHA512 6eb0e828afcd6265babd4cefd50191610095c8d6309b75089ecf3f34363231bf8a2b68c3db0d3938904951035232b9bafcb2029de832e9c7515922dad3ceac1b
 DIST longrun-0.9.tar.bz2 11539 BLAKE2B a308dc7f350399da0bf593e2eee8109a90103b298d943976f0da143c52105362aa100763dcdd3cacd4c3244cdd5a7eb9a1b355aa803a69a2225ea18c6e5a60dd SHA512 6b38160f54d0cb9124c46c0e3ba22faf4ba4376ef58f7db40aabbab20836b1551dd839d28e5bf49540a5ce0e13312bd1d7332cc59ce45fa49f81d0b9746ef055
 DIST longrun_0.9-19.diff.gz 14697 BLAKE2B 98a7497679df5be0346a37b6119a9418c7fba80672eb2c345784628c3517c6f1fbc8d953abe2696a3b576310cd489e5c1d3595153bbfa9d82dfb44697c246116 SHA512 591519183017dd84d6f78554eea9f215be9346efc3f30889f5a25d01c6b68bd5a949507b9a0c871f9aca0b49e415c4fa261821d4158b24c93481394403b83e35
-EBUILD longrun-0.9-r4.ebuild 1892 BLAKE2B 873fab60e84aa633070dcb1b989baf8c50f7ab0668b1f7797a203042f16a88957d0a7ad2dbbcae745461f3f34a230a1ebd2818d0351fcc716e16c2c762e07c35 SHA512 31eb732fc24e9753b50bee89048126ca6b644889ad875fc72e87d91be8897ce6385bea2836f353902656f2430c71ece3e909a15031279bb06949e72efca69275
-MISC metadata.xml 430 BLAKE2B 811da21cd5535cd1e0bc5eccf5e9d528719be696beac8fcf58ce4a7f468c45a5d58c802f02d5b1502c7f7fa6389701c112148cf987bbfb4518b0b1a8b92cdf6b SHA512 5cdee63c75352e195e930b08f01a3829529ab59267e3e3df63ed48aae7d2b8097279df91c07ff871d5c6934afc182626df2c994366a9fa88cd72b9309426b677
+EBUILD longrun-0.9-r4.ebuild 1766 BLAKE2B 6e0cece68b00d87f1d8d96059aea5f964c3215d90a48493f88358374ce09bc1798e53e4df6a9e613d918f790ffb26be3cb718ecf8550ac39de2a141f11a321e8 SHA512 447e4e55c29db55c4b105681a485e682bc7158f1a1caf4b7e3b95a572014a893ead7170290ec50b95d6fc5eda42de2ee6d81ccb501e97e532956dc368f05ff4d
+MISC metadata.xml 437 BLAKE2B 932878fe62012a5285dfc19f3e2a2d8a3f0eff2809dca919e58b81e2c82e256c1cf7fd4a8b477919973ed76ec0481ec00f25de43b78f054ae6f016948f5969d0 SHA512 1962bfa09950f194062baddd9996a84ba6264c1ed76e4e93d376a9935500a35377ea36c24fc55668d59f8488b9d3cdfe56139b91cc179d52e184f7f164d23ab9
diff --git a/app-admin/longrun/files/0.9-makefile_cflags.patch b/app-admin/longrun/files/0.9-makefile_cflags.patch
index a15229177881..8848dc667866 100644
--- a/app-admin/longrun/files/0.9-makefile_cflags.patch
+++ b/app-admin/longrun/files/0.9-makefile_cflags.patch
@@ -1,14 +1,13 @@
-Common subdirectories: longrun.old/debian and longrun/debian
-diff -u longrun.old/Makefile longrun/Makefile
---- longrun.old/Makefile	2005-08-12 22:36:14.186390784 +0300
-+++ longrun/Makefile	2005-08-12 22:37:36.157929216 +0300
-@@ -3,7 +3,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -2,8 +2,8 @@
+ 
  all: longrun README stamp-po
  
- longrun: longrun.c
+-longrun: longrun.c
 -	gcc -DLOCALEDIR=\"$(LOCALEDIR)\" -g -O2 -W -Wall -o longrun longrun.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" -W -Wall -o longrun longrun.c
++CFLAGS += -W -Wall
++CPPFLAGS += -DLOCALEDIR=\"$(LOCALEDIR)\"
  
  README: longrun.1
  	groff -Tascii -man longrun.1 | col -bx > README
-Common subdirectories: longrun.old/po and longrun/po
diff --git a/app-admin/longrun/longrun-0.9-r4.ebuild b/app-admin/longrun/longrun-0.9-r4.ebuild
index afe681e3a693..0508c52ea188 100644
--- a/app-admin/longrun/longrun-0.9-r4.ebuild
+++ b/app-admin/longrun/longrun-0.9-r4.ebuild
@@ -1,54 +1,50 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils linux-info toolchain-funcs
+EAPI=6
+
+inherit linux-info toolchain-funcs
 
 DESCRIPTION="A utility to control Transmeta's Crusoe and Efficeon processors"
 HOMEPAGE="http://freshmeat.net/projects/longrun/"
 
 DEBIAN_PATCH_VERSION="19"
-DEBIAN_PATCH="${PN}_${PV}-${DEBIAN_PATCH_VERSION}.diff.gz"
+DEBIAN_PATCH="${PN}_${PV}-${DEBIAN_PATCH_VERSION}.diff"
 SRC_URI="
 	mirror://kernel/linux/utils/cpu/crusoe/${P}.tar.bz2
-	mirror://debian/pool/main/l/${PN}/${DEBIAN_PATCH}"
+	mirror://debian/pool/main/l/${PN}/${DEBIAN_PATCH}.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-ppc x86"
 IUSE=""
 
-DEPEND=""
+DEPEND="sys-apps/groff"
 
 S=${WORKDIR}/${PN}
 
 CONFIG_CHECK="~X86_MSR ~X86_CPUID"
-
 ERROR_X86_MSR="
 Longrun needs a MSR device to function. Please select
 MSR under Processor type and features. It can be build
-directly into the kernel or as a module.
-"
-
+directly into the kernel or as a module."
 ERROR_X86_CPUID="
 Longrun needs a CPUID device to function. Please select
 CPUID under Processor type and features. It can be
-build directly into the kernel or as a module.
-"
+build directly into the kernel or as a module."
 
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd "${S}"
-	epatch "${DISTDIR}/${DEBIAN_PATCH}"
-	epatch "${FILESDIR}/${PV}-makefile_cflags.patch"
-	epatch "${FILESDIR}/${PV}-replace-loff_t.patch"
-}
+PATCHES=(
+	"${WORKDIR}"/${DEBIAN_PATCH}
+	"${FILESDIR}"/${PV}-makefile_cflags.patch
+	"${FILESDIR}"/${PV}-replace-loff_t.patch
+)
 
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	default
 	dodoc MAKEDEV-cpuid-msr
 }
 
diff --git a/app-admin/longrun/metadata.xml b/app-admin/longrun/metadata.xml
index 36cfa75cbc14..fcfeedac0c13 100644
--- a/app-admin/longrun/metadata.xml
+++ b/app-admin/longrun/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<longdescription>
-Longrun is a user space utility program for controlling the Longrun
-thermal and power save functionalities found in the processors made
-by Transmeta.
-</longdescription>
+		Longrun is a user space utility program for controlling the Longrun
+		thermal and power save functionalities found in the processors made
+		by Transmeta.
+	</longdescription>
 	<upstream>
 		<remote-id type="freshmeat">longrun</remote-id>
 	</upstream>