[gentoo-commits] repo/gentoo:master commit in: app-admin/longrun/files/, app-admin/longrun/

[gentoo-commits] repo/gentoo:master commit in: app-admin/longrun/files/, app-admin/longrun/

[David Seifert]

commit:     5df18678843df1422bf534f219ea19785bee5ff6
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 16:48:47 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 17:02:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5df18678

app-admin/longrun: Port to EAPI 6

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-admin/longrun/files/0.9-makefile_cflags.patch | 15 +++++----
 app-admin/longrun/longrun-0.9-r4.ebuild           | 38 ++++++++++-------------
 app-admin/longrun/metadata.xml                    |  8 ++---
 3 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/app-admin/longrun/files/0.9-makefile_cflags.patch b/app-admin/longrun/files/0.9-makefile_cflags.patch
index a1522917788..8848dc66786 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 afe681e3a69..0508c52ea18 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 36cfa75cbc1..fcfeedac0c1 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>