gentoo resync : 24.12.2018

4 files changed, 12 insertions, 25 deletions

diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index c03019e876ba..67a5a13ae65a 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -1,9 +1,7 @@
-AUX olsrd 479 BLAKE2B 188a78f7193a30cb63fda354ba92e162ba1bd56933c376998703c7f2cb9bee94a99f086d4cde6d0a437a9df064a21c16a77e973c9dfa68459591aa1a7294eac4 SHA512 8fab5fc2fda925a346d8f61f5be31bce666a2922c66bfb8c6a48a9943673b5be713cd5a93dd96b3d06d470793dc6136d624efb52ff1c58c8f5e6887336bffe38
+AUX olsrd 491 BLAKE2B 31844255d3aac5d427ab821a7655201ede53a3ab57ac8da3562e9db473d786c1e9acccf3512ba437d203798114ea1e9eb1fa79f4e5c6eca977b7b1357c2e668e SHA512 26329da5360bd25dacea3fde8c025f0bc34203970d2e75b47157fc0c4a3873cf6e7faa93c0a5a51bf20618846135ab18a09b6157521c3199c0667f969d491c4d
 AUX olsrd-0.9.0.2-gtk.patch 926 BLAKE2B af444d476ed31190454fc89bd6802a6c41f33625eb05e62338efce126fe06e7c59f021848ba12247d35196864496cab3ac9414bdd9cddda54ea6fb5deb2360e2 SHA512 191bb1cb0da122a9b44a9297e78998f9b1ecc70948dd9ee216b5d4fb56b41072c53249b39a6c0584366c7518ee2d4b161833be2e5289d707693dd0d87f2e6791
 AUX olsrd-0.9.6-gpsd.patch 537 BLAKE2B 841d0d92106a620aec47d781cf0a79e669e4aa3e6ba304c023a98c7776fc1df53e6bee5c080deb784106b05273a702d093617c9dc33bfa427a6f3b20c444234e SHA512 d3f89ead360acb8d1c26884ec7559c21dd1b7fbc40eb17d7d3fc2313e17d4f160b507d4b6271ed458d7b74fc7a7f1d9482fcb953d2762734fc963a1fb0e94f88
-AUX olsrd-r1.initd 95 BLAKE2B bbb1cf7ab923be8ca24ae0735b38a80d1ec5c531d7334492346e391034938c2180d55f66e854f867db46e745fb0baff1ffa71a21b2822c24ecd7fb4878febbb4 SHA512 ecbf343ec1086b4678c12d070cad8c6e9e7b8b87865c2aebe973271950fc255c64960b477eb25628809f99bebefec60724c7fa4667c820abaf1641402550175e
 DIST olsrd-0.9.6.1.tar.bz2 908871 BLAKE2B 180a30039607fd5c16676c62d0d1045bc5ce2a13675b34ca192f1f19127facb12428f6ba631e45fc42b191693a6ef987271745d769a74062ce682e1796b83dc9 SHA512 06e97c3fef6e2f24885fc96f9e68582523926188e4bbe9283c3add997c20f8cec1e691063d5cf6392e4e56dfa250c2cd8ac00035b47f56dbd2069b12b430255a
-DIST olsrd-0.9.6.2.tar.gz 20466227 BLAKE2B 45d90393814ac7cbd6b86fc532d560a415e80ed50be78ad9e55abe44d17a456546820897edcfb6cc8a05fbb6d8919dec9c413d0af7194cbf810bb8e621d66edd SHA512 fb0ff8553f33339f38338ec3f0d15aa7ad17ee30d38437a6e23c96f5a310ee7e1c907c8d8deea58e90181d4ed89f190e042fea6cb03d47adbf4851b6a630b810
+EBUILD olsrd-0.9.6.1-r1.ebuild 2337 BLAKE2B c7c96b2ce368d1245b5faab05686eb24ef8e3aae650a94939664ed0d50fa0a8c86011b0187c654dea359d6fe0fc40ad0928d89d094fdbed4ed260705a64e1f85 SHA512 bda205c6ada5a043a624e1a82385d4079258128698ae2acfc516bc74ae06ff8ef6ca8f30d1372a9645d1ea939e77b3c5792a408e5dbd2aaa373d128a19b60e73
 EBUILD olsrd-0.9.6.1.ebuild 2237 BLAKE2B bf4718bcc51719389fa7ed9beadf69134336304b719f5a289c615bea47aa5d22305bb79b2e1860edf9a9e358e409fd6bd456d36958f43d633d4517e1a0ab1f6c SHA512 8bb1a1917fe2472222ffb5c8f7dc8303894d813b6708cef05436636e4ca378170e45f635752babae7a47510bfeb8dc1fc3f5bf888062f0ff34317f8a31e6ce68
-EBUILD olsrd-0.9.6.2.ebuild 2548 BLAKE2B d96a89a164d4f24dd565ea4d222ed21c733460eee4653c1bcac2a25ef35cbeedeaf999cbdb7455af3936e90d3b63439e32da13556034634a4e686fe44012a286 SHA512 0ab7947e9fbcd1dba27150754e8fb2b46c8a31a91ed26c43100e663898cf254103a791d5c5af38819612fc6840d5ce2a608bfd569072b1a49c5b23ae91b5c6f0
 MISC metadata.xml 289 BLAKE2B c88d8f719ab7ee520a042f4a45a60a8e797eeede9823b1d21ec5e12700805666e81e96be90b9d961cdbde662ee813a7f68949cc477c40f17ace6902abfc9627e SHA512 11297ae766f53af46dd2eb5ddc9458cb3b7c4d6edb6f47030373e3e251a282ca7f0ceaa9e99bb2847c15ccba9cbd5ace0313c248a69ad6975c3bc6dbc6056520
diff --git a/net-misc/olsrd/files/olsrd b/net-misc/olsrd/files/olsrd
index aca79b9d428d..34c410e9944d 100644
--- a/net-misc/olsrd/files/olsrd
+++ b/net-misc/olsrd/files/olsrd
@@ -5,8 +5,8 @@ depend() {
 }
 
 checkconfig() {
-	if [ ! -e /etc/olsrd.conf ]; then
-		eerror "You need a /etc/olsrd.conf file to run olsrd"
+	if [ ! -e /etc/olsrd/olsrd.conf ]; then
+		eerror "You need a /etc/olsrd/olsrd.conf file to run olsrd"
 		eerror "There is sample file in /usr/share/doc/olsrd-version/"
 		return 1
 	fi
diff --git a/net-misc/olsrd/files/olsrd-r1.initd b/net-misc/olsrd/files/olsrd-r1.initd
deleted file mode 100644
index 9bca9b37074e..000000000000
--- a/net-misc/olsrd/files/olsrd-r1.initd
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/sbin/openrc-run
-command="/usr/sbin/olsrd"
-command_background="yes"
-pidfile="/run/olsrd.pid"
diff --git a/net-misc/olsrd/olsrd-0.9.6.2.ebuild b/net-misc/olsrd/olsrd-0.9.6.1-r1.ebuild
index f52b1c40cc98..32a6685bd66a 100644
--- a/net-misc/olsrd/olsrd-0.9.6.2.ebuild
+++ b/net-misc/olsrd/olsrd-0.9.6.1-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-inherit multilib toolchain-funcs
+EAPI=6
+inherit eutils multilib toolchain-funcs versionator
 
 DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
 HOMEPAGE="http://www.olsr.org/"
-SRC_URI="https://github.com/OLSR/olsrd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://www.olsr.org/releases/$(get_version_component_range 1-2)/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="BSD LGPL-2.1"
@@ -40,7 +40,7 @@ src_prepare() {
 		-e 's|@$(CC)|$(CC)|g' \
 		-e 's|@ar |$(AR) |g' \
 		-e '/^prefix/s:/usr/local:/usr:' \
-		$( find . -name 'Makefile*' ) || die
+		$( find -name 'Makefile*' ) || die
 
 	# respect LDFLAGS
 	sed -i \
@@ -76,18 +76,11 @@ src_install() {
 			LIBDIR="${D}/usr/$(get_libdir)/${PN}" DESTDIR="${D}" install
 	fi
 
-	# decompress default compressed man pages to honor user wishes
-	local compressed_man_pages=(
-		"${ED%/}"/usr/share/man/man5/olsrd.conf.5.gz
-		"${ED%/}"/usr/share/man/man8/olsrd.8.gz
-	)
+	doinitd "${FILESDIR}"/${PN}
 
-	local compressed_man_page=
-	for compressed_man_page in ${compressed_man_pages[@]}; do
-		gzip -d "${compressed_man_page}" || die
-	done
-
-	newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
+	gzip -d \
+		"${ED%/}"/usr/share/man/man5/olsrd.conf.5.gz \
+		"${ED%/}"/usr/share/man/man8/olsrd.8.gz
 
 	dodoc CHANGELOG \
 		valgrind-howto.txt files/olsrd.conf.default.rfc \