gentoo resync : 30.12.2017

4 files changed, 52 insertions, 59 deletions

diff --git a/app-admin/fetchlog/Manifest b/app-admin/fetchlog/Manifest
index fcc1b58801ef..9e1c7b03b372 100644
--- a/app-admin/fetchlog/Manifest
+++ b/app-admin/fetchlog/Manifest
@@ -1,5 +1,4 @@
-DIST fetchlog-1.0.tar.gz 24016 BLAKE2B 0e9dd36767efa9e69741dead04cb6b48376c1f8393c12de286e4cd9510fc73685988a8a724ec80aeac8f36b52ce0f62581e85ba2ee049768c94988750f3a164f SHA512 66a7a456ebb5353171b2f53071a73cccd66d42dafc2740bafd7c9db860f68176dffe10e556fde52048f2b198c2eaf8299d1fd6094726f7a003987b5ce0be7415
+AUX fetchlog-1.4-fix-build-system.patch 631 BLAKE2B ebbc0d0e90c5183a2ac396ffc26356223b5b8072100a9a6dc2f7fd0c9c94287213f7f8f8749e3e54612f7c777848012f92fccfbb02295345d578dcbd974f3091 SHA512 480a30e040f56e3e1cf21172dc7f7f060fa81a8a0efb95e15a20b7762444b356547435f3eacc4cdb7a504f3049f6b05a7fab219f6cab9d3fe7901968a69c796e
 DIST fetchlog-1.4.tar.gz 32393 BLAKE2B 2741c536dfb17414ffaf90cebd9f8c7c1a1c80edb30bc726f15aa6acd610a07afb926c2566d27b30125e7f4733c1abde8eb81c68d81f609bc05328cf90755d44 SHA512 51590c0cdfa8f4a15fcb4a436375d960c25f35d84558ab46def58f83c97da30caee449eea7c62c539da786a613c2b1e51dbc223d70d56c21daad6e9faf8a51ad
-EBUILD fetchlog-1.0.ebuild 904 BLAKE2B c099c84db0b434197b6649070b2fc4ccef50900b82bcaf51ec20651608a6d5d907998cd99f0c0f01bbb715969f7b3f22a9c16e4496e3de599a21a5099253a83f SHA512 ce1a7d38d71c48fbc7a98ebad164701596fe32cbe8754c472ac37eff1448c89f8d73eaab5bcf9545b11019afee82780339e44575ed66d811b2aeb6d274ff114f
-EBUILD fetchlog-1.4-r1.ebuild 921 BLAKE2B c4770b88ef75759ea8236ad02ef8800c2291b502b00cdc242092eec75eb9562cd42d383c95221bf8090c6b4a1f3b85f3ffc5ab3d4038d088cb8144528f92b715 SHA512 fb740e43998b05e924e8f6818dfd4e2faba6c946a23bbf1300d1913cf11ab17e4c089622aa2f4dacdddcc6058c1b75aeb9708f2ead6105415bbd42c26e59693b
+EBUILD fetchlog-1.4-r1.ebuild 901 BLAKE2B b63c8dedb7800b1d792ebaeefc371c92f1e4c0149814087a34c1621d28a59d84422a2e53c2f2a4fcaa5d9d9eed4ab214a888527efeba25a39c5eacc82a4c78ea SHA512 5dc6ccac654048c675b1d72f4ace6ce832dd79c5fb445257c4f0176d27d5f6a34460a9e3d879d949cb479fc9bae232d68388459b632dadfa859b72f1671e87dd
 MISC metadata.xml 250 BLAKE2B a7de32c64d6f141fafdc392101c9c7ddeabb84d3c2f452662c96e27aa5e5f9d3ce47336bc707eb61396b02bee553a624a75195b7bc84949aabb5b660b1800dab SHA512 c4bde4a741bd01c371d3a4dec51ba522ad6ccb2fb95214e41f93366bedd37d7ca1729e638a5aee8e6af9e2280ce6c06c80e404428516e6a5c86264a629e87fe9
diff --git a/app-admin/fetchlog/fetchlog-1.0.ebuild b/app-admin/fetchlog/fetchlog-1.0.ebuild
deleted file mode 100644
index 85b9ef56513c..000000000000
--- a/app-admin/fetchlog/fetchlog-1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs
-
-DESCRIPTION="Displays the last new messages of a logfile"
-HOMEPAGE="http://fetchlog.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fetchlog/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~ppc64"
-
-IUSE="snmp"
-
-RDEPEND="snmp? (
-	>=dev-perl/Net-SNMP-4.0.1-r2
-	>=net-analyzer/net-snmp-5.0.6
-	)"
-
-pkg_preinst() {
-	elog
-	elog "This utility can be used together with Nagios"
-	elog "To make use of these features you need to"
-	elog "install net-analyzer/nagios."
-	elog "This feature depends on SNMP, so make use you"
-	elog "have 'snmp' in your USE flags"
-	elog
-}
-
-src_compile() {
-	# Links the .c file straight to the binary
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" || die
-}
-
-src_install() {
-	dodoc CHANGES README*
-	dobin fetchlog
-	doman fetchlog.1
-}
diff --git a/app-admin/fetchlog/fetchlog-1.4-r1.ebuild b/app-admin/fetchlog/fetchlog-1.4-r1.ebuild
index 0893accd6e63..c4313f546021 100644
--- a/app-admin/fetchlog/fetchlog-1.4-r1.ebuild
+++ b/app-admin/fetchlog/fetchlog-1.4-r1.ebuild
@@ -8,16 +8,31 @@ inherit toolchain-funcs
 DESCRIPTION="Displays the last new messages of a logfile"
 HOMEPAGE="http://fetchlog.sourceforge.net/"
 SRC_URI="mirror://sourceforge/fetchlog/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc64"
-
+KEYWORDS="amd64 ppc x86 ~ppc64"
 IUSE="snmp"
 
-RDEPEND="snmp? (
-	>=dev-perl/Net-SNMP-4.0.1-r2
-	>=net-analyzer/net-snmp-5.0.6
+RDEPEND="
+	snmp? (
+		>=dev-perl/Net-SNMP-4.0.1-r2
+		>=net-analyzer/net-snmp-5.0.6
 	)"
+DEPEND=""
+
+PATCHES=( "${FILESDIR}"/${PN}-1.4-fix-build-system.patch )
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin fetchlog
+	einstalldocs
+	dodoc *cfg*
+	doman fetchlog.1
+}
 
 pkg_preinst() {
 	elog
@@ -28,15 +43,3 @@ pkg_preinst() {
 	elog "have 'snmp' in your USE flags"
 	elog
 }
-
-src_compile() {
-	# Links the .c file straight to the binary
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dodoc CHANGES README*
-	dodoc *cfg*
-	dobin fetchlog
-	doman fetchlog.1
-}
diff --git a/app-admin/fetchlog/files/fetchlog-1.4-fix-build-system.patch b/app-admin/fetchlog/files/fetchlog-1.4-fix-build-system.patch
new file mode 100644
index 000000000000..53c05d85f74c
--- /dev/null
+++ b/app-admin/fetchlog/files/fetchlog-1.4-fix-build-system.patch
@@ -0,0 +1,30 @@
+--- a/Makefile
++++ b/Makefile
+@@ -23,8 +23,8 @@
+ ### compiler
+ 
+ ### gcc
+-CC=gcc
+-CFLAGS= -O -Werror -Wall -Wcast-qual -Wstrict-prototypes \
++CC ?= gcc
++CFLAGS += -Wall -Wcast-qual -Wstrict-prototypes \
+ 	-Wmissing-prototypes -Wmissing-declarations -Winline -Wcast-align 
+ ### cc
+ #CC=cc
+@@ -72,7 +72,7 @@
+ 
+ # compiler stuff
+ # --------------
+-CC_OPT= $(CFLAGS) -DFETCHLOG_VERSION_NO=\"$(FETCHLOG_VERSION)\" \
++CPPFLAGS += -DFETCHLOG_VERSION_NO=\"$(FETCHLOG_VERSION)\" \
+ 	$(HAS_MADVISE) $(HAS_REGEX)
+ 
+ # all
+@@ -82,7 +82,6 @@
+ # fetchlog
+ # -------
+ fetchlog: fetchlog.c 
+-	$(CC) $(CC_OPT) fetchlog.c -o fetchlog
+ 
+ 
+ # install