gentoo resync : 30.12.2017

4 files changed, 75 insertions, 98 deletions

diff --git a/app-admin/integrit/Manifest b/app-admin/integrit/Manifest
index 3be0fb6a50ac..83a96c76cac2 100644
--- a/app-admin/integrit/Manifest
+++ b/app-admin/integrit/Manifest
@@ -1,5 +1,4 @@
-DIST integrit-4.0.tar.gz 266001 BLAKE2B ae0b5aaabeb593080d795b3b1d25af213bae9dc39a24c2ef6222c37919b81b39cf3b012bc4cb02fa9826bc6f68299919dd17253255c295481d64bd0bd71f031c SHA512 d05722285e850aea2a07baa8020a379e595f30cfe9d9142d437d6c15f41c5a687ada476971765cab9cf5972be8c4c76a6495c6fb09438d3b35584c8be5d5a4e5
+AUX integrit-4.1-fix-build-system.patch 1169 BLAKE2B 36b13162ea3a583968bda35ece1b4b1cc83871d4c2352ebcbffd079a9265d84b15e72d5e93f10e2404cd26e0622c666cb8b60e1cd53f207f0149a55814e10477 SHA512 4ed15ee8383e280b2d16d353f3401a058ad03c4ad84e4d0932ceec74391e04d266c2468270d2a08d299c57ee105f504c917fcf04b4ac07639bcba42e0fde84f6
 DIST integrit-4.1.tar.gz 271626 BLAKE2B 538a34c8e5c00e1be66ba35095be4d61402372ea7fd9ba9bfff9149c9a82c43d625ffb345fe84b7561100b31f2a2a1ba319e8b9a7d2b78e44a81d1ed6ae64f3a SHA512 599ae66a193fd87971994f59422e148e1ae01a5ff0fea93a0f2555c972f5254f0213116950766e72c87a57b1bd490f04afd3e0557d25a366c41dbbacc80b6842
-EBUILD integrit-4.0.ebuild 1329 BLAKE2B dd1a2626442104111202a774c27ab3eaf44cbbf450100a70615c643e7f9d0d103adb04f412e1d861e9c58f4b7cc6c70b6f01a3cddb627cae77e2d4e8fc007747 SHA512 690651f570ff866a944ee9bb5bd2641f03b43208872483cba4978bbffad0b4dcd80977d5152a5012920bb65a4ca9c8f3fd1f6bc860b7386494d70be92cc5e3ff
-EBUILD integrit-4.1-r1.ebuild 1311 BLAKE2B 49e69aa0e6e762c543ecd4ec6daaefa4613b9f6de6ba13cf6d25cf03c2cccf7e5f1a0989ab69452f365c468c134c72940aaced7c34767de95681f88904f79c3a SHA512 f8d8591e5c9288d2adcbf01e2ee68ce40d93d7fa1bd945d7a92d4c590a2a808f146601d131366c0eddf1acd8ac1979529aaaba1d319e12c31aad9a4e764a760f
+EBUILD integrit-4.1-r1.ebuild 1264 BLAKE2B 208f5ff74d53a189f7eabd131e3f032cff73d467e4622d317148d9a17c4b7db55335815ec6e59ba85794794bac1bff901dbd7d21b04e32ea0714fd3c7c54d5f1 SHA512 8cbb22064be0107ae5fa363185ccdecf347e7078a0d455d0af8af59b504282005816c1c52e3a01999568bb39a89e30043c48c556b6e78579c25dbc72afe8a5f4
 MISC metadata.xml 245 BLAKE2B 8edad0fa1051f1c6b28fa61e95cbde797389dcae4a23b953e0b77198a5557e068e09cdb6b2e32ca4e25ea07789c406529094d25fa74182656a4c59f4f7a42178 SHA512 e7052ee3572f1a5546b02087b7de95803a2e8b023aa24bc701eebb0bdd47b294d9634f4e78abfa10764e88397a067b1f1f8e431cddf5f8b260693f56ebd88b8b
diff --git a/app-admin/integrit/files/integrit-4.1-fix-build-system.patch b/app-admin/integrit/files/integrit-4.1-fix-build-system.patch
new file mode 100644
index 000000000000..64b3d47e59f8
--- /dev/null
+++ b/app-admin/integrit/files/integrit-4.1-fix-build-system.patch
@@ -0,0 +1,43 @@
+--- a/configure.in
++++ b/configure.in
+@@ -26,7 +26,6 @@
+ 
+ # ----- you can override these values by setting environment variables
+ # CC=my-compiler ./configure
+-CC=${CC:-"gcc"}
+ # CFLAGS="-g foo -x bar" ./configure
+ CFLAGS=${CFLAGS-"-g -Wall -O2"}
+ STATIC=${STATIC-"-static"}
+@@ -53,10 +52,9 @@
+ dnl AC_PROG_LEX
+ AC_PROG_MAKE_SET
+ AC_PROG_AWK
+-AC_PROGRAM_PATH(RM, rm , rm)
+ dnl syncing is the job of the O.S., and users can always do "make; sync"
+ dnl AC_PROGRAM_PATH(SYNC, sync, sync)
+-AC_PROGRAM_PATH(AR, ar, ar)
++AM_PROG_AR
+ AC_PROG_RANLIB
+ 
+ dnl ---------- let users override the install that configure finds
+--- a/hashtbl/configure.in
++++ b/hashtbl/configure.in
+@@ -25,17 +25,15 @@
+ 
+ # ----- you can override these values by setting environment variables
+ # CC=my-compiler ./configure
+-CC=${CC:-"gcc"}
+ # CFLAGS="-g foo -x bar" ./configure
+ CFLAGS=${CFLAGS:-"-g -Wall -O2"}
+ STATIC=${STATIC:-"-static"}
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
+-AC_PROGRAM_PATH(RM, rm , rm)
+ dnl syncing is the job of the O.S., and users can always do "make; sync"
+ dnl AC_PROGRAM_PATH(SYNC, sync, sync)
+-AC_PROGRAM_PATH(AR, ar, ar)
++AM_PROG_AR
+ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
+ 
diff --git a/app-admin/integrit/integrit-4.0.ebuild b/app-admin/integrit/integrit-4.0.ebuild
deleted file mode 100644
index f27b03a3238d..000000000000
--- a/app-admin/integrit/integrit-4.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="file integrity verification program"
-HOMEPAGE="http://integrit.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "/^CC/d" configure.in hashtbl/configure.in || die
-	sed -i -e "/^AC_PROGRAM_PATH/d" configure.in hashtbl/configure.in || die
-
-	eautoreconf
-}
-
-src_compile() {
-	tc-export AR
-	econf
-	emake || die
-	emake utils || die
-	cd "${S}"/doc
-	emake || die
-	cd "${S}"/hashtbl
-	emake hashtest || die
-	mv README README.hashtbl
-}
-
-src_install() {
-	dosbin integrit || die
-	dolib libintegrit.a
-	dodoc Changes HACKING README todo.txt
-
-	cd "${S}"/utils
-	dosbin i-viewdb
-	dobin i-ls
-
-	cd "${S}"/hashtbl
-	dolib libhashtbl.a
-	insinto /usr/include
-	doins hashtbl.h
-	dobin hashtest
-	dodoc README.hashtbl
-
-	cd "${S}"/doc
-	doman i-ls.1 i-viewdb.1 integrit.1
-	doinfo integrit.info
-
-	cd "${S}"/examples
-	docinto examples
-	dodoc *
-}
-
-pkg_postinst() {
-	elog "It is recommended that the integrit binary is copied to a secure"
-	elog "location and re-copied at runtime or run from a secure medium."
-	elog "You should also create a configuration file (see examples)."
-}
diff --git a/app-admin/integrit/integrit-4.1-r1.ebuild b/app-admin/integrit/integrit-4.1-r1.ebuild
index d987937dc338..bac0fe23c099 100644
--- a/app-admin/integrit/integrit-4.1-r1.ebuild
+++ b/app-admin/integrit/integrit-4.1-r1.ebuild
@@ -1,61 +1,61 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
-inherit autotools toolchain-funcs
+inherit autotools
 
 DESCRIPTION="file integrity verification program"
 HOMEPAGE="http://integrit.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
+PATCHES=( "${FILESDIR}"/${PN}-4.1-fix-build-system.patch )
+
 src_prepare() {
-	sed -i -e "/^CC/d" configure.in hashtbl/configure.in || die
-	sed -i -e "/^AC_PROGRAM_PATH/d" configure.in hashtbl/configure.in || die
+	default
+	mv configure.{in,ac} || die
+	mv hashtbl/configure.{in,ac} || die
+
+	# tests are not executable
+	chmod +x test/test || die
+
 	eautoreconf
-	tc-export AR
 }
 
 src_compile() {
 	emake
 	emake utils
 
-	cd "${S}"/doc && emake
-	cd "${S}"/hashtbl && emake hashtest
-}
-
-src_test() {
-	chmod +x test/test || die
-	default
+	emake -C doc
+	emake -C hashtbl hashtest
 }
 
 src_install() {
 	dosbin integrit
-	dolib libintegrit.a
+	dolib.a libintegrit.a
 	dodoc Changes HACKING README todo.txt
 
-	cd "${S}"/utils
-	dosbin i-viewdb
-	dobin i-ls
+	# utils
+	dosbin utils/i-viewdb
+	dobin utils/i-ls
 
-	cd "${S}"/hashtbl
-	dolib libhashtbl.a
-	insinto /usr/include
-	doins hashtbl.h
-	dobin hashtest
-	newdoc README README.hashtbl
+	# hashtbl
+	dolib.a hashtbl/libhashtbl.a
+	doheader hashtbl/hashtbl.h
+	dobin hashtbl/hashtest
+	newdoc hashtbl/README README.hashtbl
 
-	cd "${S}"/doc
-	doman i-ls.1 i-viewdb.1 integrit.1
-	doinfo integrit.info
+	# doc
+	doman doc/{i-ls.1,i-viewdb.1,integrit.1}
+	doinfo doc/integrit.info
 
-	cd "${S}"/examples
-	docinto examples
-	dodoc *
+	# examples
+	dodoc -r examples
 }
 
 pkg_postinst() {