commit: c4529e80fd54388055d1d50a8639d17b55725bd1 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Fri Feb 3 21:32:27 2017 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Fri Feb 3 21:32:40 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4529e80
net-misc/olsrd: Old. Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-misc/olsrd/Manifest | 1 - net-misc/olsrd/files/olsrd-0.6.1-build_fix.patch | 11 --- net-misc/olsrd/files/olsrd-0.6.3-make-gtk.patch | 22 ------ net-misc/olsrd/olsrd-0.6.4-r1.ebuild | 88 ------------------------ 4 files changed, 122 deletions(-) diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest index 58a18ee..f928580 100644 --- a/net-misc/olsrd/Manifest +++ b/net-misc/olsrd/Manifest @@ -1,3 +1,2 @@ -DIST olsrd-0.6.4.tar.bz2 5469577 SHA256 f8ab1bbdf2e424573a5bff9f2bf6e308c1307556e95c1de72b011949db20945f SHA512 a64b27f6f8ab772e79402ea0ea9e90ea1f980f9bd1fdbb608b41c91f2f942a546757f3a17fd71bd6f4b3dba69d7e96b7b0e028e4b4dcd39c3c22cf0f802cdbcd WHIRLPOOL 0c42e12e7e89719b8e9f7a4b931a71e0aa797bf2ba8507fa1f4dd3b6ede9cbe34ef8f3b3d819646959e54cde8cd61f165daab6b4b6f1e29560899f4bd24f9967 DIST olsrd-0.9.0.2.tar.bz2 5439596 SHA256 cc464b29c7740354d815d5faa753fd27c0677d71e8eb42e78abc382996892845 SHA512 a0fc1fd21c7cc7a374bc24379b13b29525e584fa4f116c5d8e14449c3e614de4cb153bba653de48e99a278a6abe3285b059101b1ba96882bd94983dc2b907058 WHIRLPOOL 55a05cd332396ba70fd2e7e86a3ad791e02285074b5f32dc75ffb8ad1af1183534248760e52c31878cfac627988a67edab37711ce6435da6179272db9ae5af89 DIST olsrd-0.9.6.tar.bz2 908597 SHA256 d68f59f26f8bcf7136e622759b6ec14f806ea1afd0d2c68818dcb7ec6461c1b0 SHA512 74f08a0261795b828d47823088ef44cdb0ddccc99c304e10af6859716a2267ddc905a2f10904021ed79742d483e87e5e8b4a035cd1eea9d9266231090a7ff050 WHIRLPOOL 012b08b4b759646ab863909dba311fc46274843a998f56412e3f0fcfcae15e1950e97b9463210bfe5b6734f1456a2ea018b5bbab67480b8ad803d267b8ef81a3 diff --git a/net-misc/olsrd/files/olsrd-0.6.1-build_fix.patch b/net-misc/olsrd/files/olsrd-0.6.1-build_fix.patch deleted file mode 100644 index 9a8683e..00000000 --- a/net-misc/olsrd/files/olsrd-0.6.1-build_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -71,8 +71,6 @@ - switch: - $(MAKECMD) -C $(SWITCHDIR) - --# generate it always --.PHONY: src/builddata.c - src/builddata.c: - @$(RM) "$@" - @echo "#include \"defs.h\"" >> "$@" diff --git a/net-misc/olsrd/files/olsrd-0.6.3-make-gtk.patch b/net-misc/olsrd/files/olsrd-0.6.3-make-gtk.patch deleted file mode 100644 index 12e983d..00000000 --- a/net-misc/olsrd/files/olsrd-0.6.3-make-gtk.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/gui/linux-gtk/Makefile -+++ b/gui/linux-gtk/Makefile -@@ -1,8 +1,8 @@ - CC ?= gcc - --CFLAGS += -Wall `pkg-config --cflags gtk+-2.0` -+CFLAGS += -Wall $(shell pkg-config --cflags gdk-pixbuf-2.0 glib-2.0 gtk+-2.0) - LDFLAGS += --LIBS := `pkg-config --libs gtk+-2.0` -lm -+LIBS := $(shell pkg-config --libs gdk-pixbuf-2.0 glib-2.0 gtk+-2.0) -lm - - OBJS= src/main.o src/interface.o src/callbacks.o src/ipc.o \ - src/packet.o src/nodes.o src/routes.o -@@ -10,7 +10,7 @@ - all: olsrd-gui - - olsrd-gui: $(OBJS) -- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) - - clean: - rm -f $(OBJS) olsrd-gui diff --git a/net-misc/olsrd/olsrd-0.6.4-r1.ebuild b/net-misc/olsrd/olsrd-0.6.4-r1.ebuild deleted file mode 100644 index e0363f1..00000000 --- a/net-misc/olsrd/olsrd-0.6.4-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils multilib toolchain-funcs versionator - -MY_PV="$(replace_version_separator 3 '-r')" -DESCRIPTION="An implementation of the Optimized Link State Routing protocol" -HOMEPAGE="http://www.olsr.org/"; -SRC_URI="http://www.olsr.org/releases/$(get_version_component_range 1-2)/${PN}-${MY_PV}.tar.bz2" - -SLOT="0" -LICENSE="BSD LGPL-2.1" -KEYWORDS="amd64 x86" -IUSE="gtk" -DEPEND=" - gtk? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - ) -" -RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}-${MY_PV}" - -src_prepare() { - epatch \ - "${FILESDIR}/${PN}-0.6.1-build_fix.patch" \ - "${FILESDIR}/${PN}-0.6.3-make-gtk.patch" - - # 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_compile() { - emake \ - CC="$(tc-getCC)" \ - LIBDIR="/usr/$(get_libdir)/${PN}" \ - OLSRD_LDFLAGS="${LDFLAGS}" \ - OS=linux \ - build_all - if use gtk; then - emake -C "${S}/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 "${S}/gui/linux-gtk" \ - LIBDIR="${D}/usr/$(get_libdir)/${PN}" DESTDIR="${D}" install - fi - - doinitd "${FILESDIR}/${PN}" - - dodoc CHANGELOG \ - valgrind-howto.txt files/olsrd.conf.default.rfc \ - files/olsrd.conf.default.lq files/olsrd.conf.default.lq-fisheye \ - 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 -}
