gentoo resync : 03.12.2017

5 files changed, 55 insertions, 46 deletions

diff --git a/sys-apps/utempter/Manifest b/sys-apps/utempter/Manifest
index 3ba34ee8d8bc..651ad70e6b7f 100644
--- a/sys-apps/utempter/Manifest
+++ b/sys-apps/utempter/Manifest
@@ -1,6 +1,5 @@
-AUX utempter-0.5.5.6-build.patch 310 BLAKE2B 79f5ac19186faa7d64941971873160d7a5292bb396efb451d3639b601bc5b2e5a3ba5ef539ae64668d595c1471e0f8815d2f90bcea3616eaf370c55e0e833515 SHA512 3dc62d5e7ce326524bf4373334d474f09fb48b65b6bd1e03fd08f4dcf88a0397194fcb0b04b7a67de5c960607c53b5cf0e456f74133e6d6fc4c208943c45ce22
-AUX utempter-0.5.5.6-no_utmpx.patch 768 BLAKE2B 7432ccd5b0f00eb2b8e734c3b00fd60efcebcd23a0c9c5d9eded505084f7d795ae0a2c7d6bd2ed5df0a0461cdf47c4b6753429a86830a33222b05c23453418b4 SHA512 c6201252c8712578a5668346502f1143fabc717cb5be922a92f2af8787a1e757fa5d70aa447f5a2d6347d49edb6fce2106d21993cc6a0e85c111bd049efa3bf3
-AUX utempter-0.5.5.6-soname-makefile-fix.patch 839 BLAKE2B aba35c6d69ba55d782b689ea4462b42b14d59b81ff32925c909991625797d437f178128ce2554c0d26c6fbf0e93133c47172572782c4acb481f5645fd0fe091c SHA512 a7bf938bd0cd9e486255f43dfa4436bfba63e1d21d14abf611128e41f9e8ce87b412f7ac15ad3c78c2c307e7c8ca45fe6c3ffd41a33bb4ae7f35b93547fff79b
-DIST utempter-0.5.5-6.src.rpm 21099 SHA256 617c28d579fa54349b8a706e8346c2442f2ef39523db7e0501701a0919651f3c SHA512 81eeac830631922f2d1b2099a559b60bfd21818b38a524d3c5f61aec143b3e70e95a9ccc300f649dd81f515837fe3befaba6b93bb2e22767e71eee7acb711655 WHIRLPOOL 3ae0a32eae886f2ac14dcf36b4e96e4bb8c25966389c6608a83673149a3045b580b35832e5c69836a18a4f88b55e8c20d254470f84424e30f758a820a87ce13a
-EBUILD utempter-0.5.5.6.ebuild 1239 BLAKE2B d2696331207b2acc4665ae09aa35bcce1cc87e6e009af8db24a0661f1f323dd8fb8979c7b3eed317556e2282f874b2895b5968e250a6ee37460d0961b5df5dfa SHA512 c4f621242f77152536e4137e1f13aa9aaf362ad4f620021a076008102284cce9246300c029e5dd0cfcfaf7624978fb8b3de1a0bd52a484f8f88244d06d07ea39
+AUX utempter-0.5.5.6-fix-build-system.patch 1168 BLAKE2B c513d18115a7a78e2c4d381f7ae650aa56de4d0833fa7c610948da072c4a1e85ae6832517012dd0c04ca91f4c3cb51d8b3b332c58b66b0716c63e3576917fe77 SHA512 a2febc07a01e0f9f95c8c846616d8f46e74e3db2ea66af720539f6825019dd05ab5472507210945c5caf84566584ab01824ebf0f16e51e7012f1334fc5a920b4
+AUX utempter-0.5.5.6-no_utmpx.patch 666 BLAKE2B 9ee0c3634b87ddd50d50f81811f749f615e4fad8dc27b9fc97cc1b61ffdd64eb5045910457547b2cbc245c593490ab354e3a7f5a5965a8aeebf330c6b32d4889 SHA512 4cdc7616f1b886b74fa39272f502fb9eb303047c93be57122ba32517f49a0274e4f7e02b25ead9dd9b60584610a576cb2d78c6350350b3d8364ccd903c3dafcf
+DIST utempter-0.5.5-6.src.rpm 21099 BLAKE2B a4a8c53ab31d53ec56d60a16e5c1d3a0a2ec6c73c3c3025c15dfc389da75f969545392b46976017cfcde1d9f9ca974b14786bbf39709aebdda890df13a7866ed SHA512 81eeac830631922f2d1b2099a559b60bfd21818b38a524d3c5f61aec143b3e70e95a9ccc300f649dd81f515837fe3befaba6b93bb2e22767e71eee7acb711655
+EBUILD utempter-0.5.5.6.ebuild 1178 BLAKE2B 180449c6cdfad5122e9a73538a5eabdc2c1d720fc66d97e926d1f3c720cb7ca2ae387123f10b1ed3acf4b9ab1b73132fcaa4e83715610355e3f387816ae28a45 SHA512 4d575c5df427cfc522934c23464154c40af12c54d1e7baed46c52e3d34ae252d1305c6408a990d40dab8bac1338865d5f243d7bce8e6ead232b8fad0aa7d0778
 MISC metadata.xml 344 BLAKE2B 090f0e14a3a7fec427cbffa3abc85b6caf242a4f471358ba0614a23682a183a2ac93fd4d6695ab0059b0c7e5573d8429ea4600506050753e2ceca3c1217c394a SHA512 77307533cb1ddb71561957493f7062330c1748f62ab1381f369c5fb864f0e2a6608cfa5c86005b816c2a9a2523bb9a2264c807f1d6c31a5e2bb6177876b94ed9
diff --git a/sys-apps/utempter/files/utempter-0.5.5.6-build.patch b/sys-apps/utempter/files/utempter-0.5.5.6-build.patch
deleted file mode 100644
index 8fbfb111196f..000000000000
--- a/sys-apps/utempter/files/utempter-0.5.5.6-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -37,7 +37,7 @@
- 	ln -sf $(SHAREDLIB).$(VERSION) $(RPM_BUILD_ROOT)/$(LIBDIR)/$(SHAREDLIB).$(SOMAJOR)
- 
- $(SHAREDLIB): utmpintf.os
--	$(CC) -o $@ -shared -Wl,-soname,$(SONAME) $^ -lc
-+	$(CC) $(LDFLAGS) -o $@ -shared -Wl,-soname,$(SONAME) $^ -lc
- 
- utmpintf.o: utmpintf.c utempter.h
- 
diff --git a/sys-apps/utempter/files/utempter-0.5.5.6-soname-makefile-fix.patch b/sys-apps/utempter/files/utempter-0.5.5.6-fix-build-system.patch
index 123c77eb357c..83b41a04b25f 100644
--- a/sys-apps/utempter/files/utempter-0.5.5.6-soname-makefile-fix.patch
+++ b/sys-apps/utempter/files/utempter-0.5.5.6-fix-build-system.patch
@@ -1,6 +1,6 @@
---- Makefile.orig	2005-04-15 08:54:32.000000000 -0400
-+++ Makefile	2005-04-15 08:56:17.000000000 -0400
-@@ -5,6 +5,10 @@
+--- a/Makefile
++++ b/Makefile
+@@ -5,12 +5,14 @@
  CVSROOT=$(shell cat CVS/Root)
  # major number of the .so lib
  SOMAJOR = 0
@@ -11,7 +11,22 @@
  
  SHAREDLIB = lib$(NAME).so
  SONAME = $(SHAREDLIB).$(SOMAJOR)
-@@ -29,6 +33,8 @@
+ 
+-CFLAGS = -Wall $(RPM_OPT_FLAGS)
+-
+ TARGETS = $(NAME) utmp $(SHAREDLIB)
+ 
+ all:	$(TARGETS)
+@@ -19,7 +21,7 @@
+ 	rm -f *.so utempter utmp *.os
+ 
+ %.os : %.c
+-	$(CC) -c $(CFLAGS) -fPIC $< -o $@
++	$(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC $< -o $@
+ 
+ install:
+ 	mkdir -p $(RPM_BUILD_ROOT)/usr/sbin
+@@ -29,9 +31,11 @@
  	install -m 644 utempter.h $(RPM_BUILD_ROOT)/usr/include
  	install -m 644 $(SHAREDLIB) $(RPM_BUILD_ROOT)/$(LIBDIR)/$(SHAREDLIB).$(VERSION)
  	ln -sf $(SHAREDLIB).$(VERSION) $(RPM_BUILD_ROOT)/$(LIBDIR)/$(SHAREDLIB)
@@ -19,4 +34,8 @@
 +	ln -sf $(SHAREDLIB).$(VERSION) $(RPM_BUILD_ROOT)/$(LIBDIR)/$(SHAREDLIB).$(SOMAJOR)
  
  $(SHAREDLIB): utmpintf.os
- 	$(CC) -o $@ -shared -Wl,-soname,$(SONAME) $^ -lc
+-	$(CC) -o $@ -shared -Wl,-soname,$(SONAME) $^ -lc
++	$(CC) $(LDFLAGS) -o $@ -shared -Wl,-soname,$(SONAME) $^ -lc $(LIBS)
+ 
+ utmpintf.o: utmpintf.c utempter.h
+ 
diff --git a/sys-apps/utempter/files/utempter-0.5.5.6-no_utmpx.patch b/sys-apps/utempter/files/utempter-0.5.5.6-no_utmpx.patch
index 8644db837f4a..b6fc7ea7d27e 100644
--- a/sys-apps/utempter/files/utempter-0.5.5.6-no_utmpx.patch
+++ b/sys-apps/utempter/files/utempter-0.5.5.6-no_utmpx.patch
@@ -1,5 +1,5 @@
---- utempter-0.5.5/utempter.c.mps	2004-12-11 14:54:06.000000000 +0100
-+++ utempter-0.5.5/utempter.c	2004-12-11 14:57:46.000000000 +0100
+--- a/utempter.c
++++ b/utempter.c
 @@ -11,7 +11,9 @@
  #include <sys/stat.h>
  #include <sys/sysmacros.h>
diff --git a/sys-apps/utempter/utempter-0.5.5.6.ebuild b/sys-apps/utempter/utempter-0.5.5.6.ebuild
index 4866160d3cd1..6fd2931dcb40 100644
--- a/sys-apps/utempter/utempter-0.5.5.6.ebuild
+++ b/sys-apps/utempter/utempter-0.5.5.6.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit rpm eutils user
+EAPI=6
+
+inherit flag-o-matic rpm toolchain-funcs user
 
 MY_P=${P%.*}-${PV##*.}
-S=${WORKDIR}/${P%.*}
+
 DESCRIPTION="App that allows non-privileged apps to write utmp (login) info"
 HOMEPAGE="https://www.redhat.com/"
 SRC_URI="mirror://gentoo/${MY_P}.src.rpm"
@@ -14,43 +16,43 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-RDEPEND="!sys-libs/libutempter
+RDEPEND="
+	!sys-libs/libutempter
 	!dev-python/utmp"
 
+S=${WORKDIR}/${P%.*}
+PATCHES=(
+	"${FILESDIR}"/${P}-no_utmpx.patch
+	"${FILESDIR}"/${P}-fix-build-system.patch
+)
+
 pkg_setup() {
 	enewgroup utmp 406
 }
 
-src_unpack() {
-	rpm_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-soname-makefile-fix.patch
-	epatch "${FILESDIR}"/${P}-no_utmpx.patch
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_compile() {
-	emake RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" || die
+src_configure() {
+	tc-export CC
+	append-cflags -Wall
 }
 
 src_install() {
 	emake \
-		RPM_BUILD_ROOT="${D}" \
+		RPM_BUILD_ROOT="${ED}" \
 		LIBDIR=/usr/$(get_libdir) \
-		install || die
-	dobin utmp || die
+		install
+	dobin utmp
 
 	fowners root:utmp /usr/sbin/utempter
 	fperms 2755 /usr/sbin/utempter
 }
 
 pkg_postinst() {
-	if [ -f "${ROOT}"/var/log/wtmp ] ; then
-		chown root:utmp "${ROOT}"/var/log/wtmp
-		chmod 664 "${ROOT}"/var/log/wtmp
+	if [[ -f "${EROOT%/}"/var/log/wtmp ]] ; then
+		chown root:utmp "${EROOT%/}"/var/log/wtmp
+		chmod 664 "${EROOT%/}"/var/log/wtmp
 	fi
-	if [ -f "${ROOT}"/var/run/utmp ] ; then
-		chown root:utmp "${ROOT}"/var/run/utmp
-		chmod 664 "${ROOT}"/var/run/utmp
+	if [[ -f "${EROOT%/}"/var/run/utmp ]] ; then
+		chown root:utmp "${EROOT%/}"/var/run/utmp
+		chmod 664 "${EROOT%/}"/var/run/utmp
 	fi
 }