[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/files/, net-misc/olsrd/

[Jeroen Roovers]

commit:     2336e0d0c0b0fd2709f637618275cedd67bfeef1
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 23 16:47:24 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Nov 23 16:52:17 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2336e0d0

Revert "net-misc/olsrd: bump to v0.9.6.2"

Official releases can be found at http://www.olsr.org/releases/
0.9.6.2 is not an official release and does not even work properly.

This reverts commit 28a5ba525fbef8709e1972830b31ade6744e0208.

Bug: https://bugs.gentoo.org/642108
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-misc/olsrd/Manifest             |   1 -
 net-misc/olsrd/files/olsrd-r1.initd |   4 --
 net-misc/olsrd/olsrd-0.9.6.2.ebuild | 108 ------------------------------------
 3 files changed, 113 deletions(-)

diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index 7d58d99adbe..7df3615b807 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -1,2 +1 @@
 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

diff --git a/net-misc/olsrd/files/olsrd-r1.initd b/net-misc/olsrd/files/olsrd-r1.initd
deleted file mode 100644
index 9bca9b37074..00000000000
--- 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.2.ebuild
deleted file mode 100644
index f52b1c40cc9..00000000000
--- a/net-misc/olsrd/olsrd-0.9.6.2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-inherit multilib toolchain-funcs
-
-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"
-
-SLOT="0"
-LICENSE="BSD LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk pud"
-DEPEND="
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2
-	)
-	pud? ( sci-geosciences/gpsd )
-"
-RDEPEND="
-	${DEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.0.2-gtk.patch
-	"${FILESDIR}"/${PN}-0.9.6-gpsd.patch
-)
-src_prepare() {
-	default
-
-	# fix parallel make
-	# respect AR
-	# verbose build
-	# fix default prefix, bug #453440
-	sed -i \
-		-e '/@echo "\[/d' \
-		-e 's|$(MAKECMD)|$(MAKE)|g' \
-		-e 's|@$(CC)|$(CC)|g' \
-		-e 's|@ar |$(AR) |g' \
-		-e '/^prefix/s:/usr/local:/usr:' \
-		$( find . -name 'Makefile*' ) || die
-
-	# respect LDFLAGS
-	sed -i \
-		-e 's|$(CC)|& $(OLSRD_LDFLAGS)|g' \
-		lib/pud/nmealib/Makefile lib/pud/wireformat/Makefile || die
-}
-
-src_configure() {
-	if ! use pud; then
-		sed -i -e '/^SUBDIRS/ s|pud||g' Makefile || die
-	fi
-}
-
-src_compile() {
-	tc-export PKG_CONFIG
-	emake \
-		CC="$(tc-getCC)" \
-		VERBOSE=1 \
-		LIBDIR="/usr/$(get_libdir)/${PN}" \
-		OLSRD_LDFLAGS="${LDFLAGS}" \
-		OS=linux \
-		build_all
-	if use gtk; then
-		emake -C gui/linux-gtk LIBDIR="/usr/$(get_libdir)/${PN}" CC="$(tc-getCC)"
-	fi
-}
-
-src_install() {
-	emake OS=linux LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
-		DESTDIR="${D}" STRIP=true install_all
-	if use gtk; then
-		emake -C gui/linux-gtk \
-			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
-	)
-
-	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}
-
-	dodoc CHANGELOG \
-		valgrind-howto.txt files/olsrd.conf.default.rfc \
-		files/olsrd.conf.default.lq \
-		lib/arprefresh/README_ARPREFRESH \
-		lib/bmf/README_BMF \
-		lib/dot_draw/README_DOT_DRAW \
-		lib/dyn_gw/README_DYN_GW \
-		lib/dyn_gw_plain/README_DYN_GW_PLAIN \
-		lib/httpinfo/README_HTTPINFO \
-		lib/mini/README_MINI \
-		lib/nameservice/README_NAMESERVICE \
-		lib/pgraph/README_PGRAPH \
-		lib/quagga/README_QUAGGA \
-		lib/secure/README_SECURE \
-		lib/txtinfo/README_TXTINFO \
-		lib/watchdog/README_WATCHDOG
-}