Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-misc/olsrd
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/olsrd')
-rw-r--r--net-misc/olsrd/ChangeLog12
-rw-r--r--net-misc/olsrd/files/olsrd-0.4.10-makefile.patch175
-rw-r--r--net-misc/olsrd/files/olsrd-0.4.10-memleak_in_olsr_remove_scheduler_event.patch10
-rw-r--r--net-misc/olsrd/files/olsrd-0.5.1-fix-hashing.patch12
-rw-r--r--net-misc/olsrd/files/olsrd-0.5.2-bmf.patch51
-rw-r--r--net-misc/olsrd/files/olsrd-0.5.4-build_fix.patch13
-rw-r--r--net-misc/olsrd/files/olsrd-0.5.5-build_fix.patch12
-rw-r--r--net-misc/olsrd/olsrd-0.4.10.ebuild55
-rw-r--r--net-misc/olsrd/olsrd-0.5.0.ebuild47
-rw-r--r--net-misc/olsrd/olsrd-0.5.1-r1.ebuild54
-rw-r--r--net-misc/olsrd/olsrd-0.5.2-r1.ebuild55
-rw-r--r--net-misc/olsrd/olsrd-0.5.3.ebuild48
-rw-r--r--net-misc/olsrd/olsrd-0.5.4.ebuild62
-rw-r--r--net-misc/olsrd/olsrd-0.5.5.ebuild63
-rw-r--r--net-misc/olsrd/olsrd-0.5.6.ebuild60
15 files changed, 11 insertions, 718 deletions
diff --git a/net-misc/olsrd/ChangeLog b/net-misc/olsrd/ChangeLog
index 499c1f6c9ed3..758f1471de2b 100644
--- a/net-misc/olsrd/ChangeLog
+++ b/net-misc/olsrd/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for net-misc/olsrd
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/ChangeLog,v 1.24 2011/10/07 17:01:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/ChangeLog,v 1.25 2011/10/09 16:52:38 jer Exp $
+
+ 09 Oct 2011; Jeroen Roovers <jer@gentoo.org> -olsrd-0.4.10.ebuild,
+ -files/olsrd-0.4.10-makefile.patch,
+ -files/olsrd-0.4.10-memleak_in_olsr_remove_scheduler_event.patch,
+ -olsrd-0.5.0.ebuild, -olsrd-0.5.1-r1.ebuild,
+ -files/olsrd-0.5.1-fix-hashing.patch, -olsrd-0.5.2-r1.ebuild,
+ -files/olsrd-0.5.2-bmf.patch, -olsrd-0.5.3.ebuild, -olsrd-0.5.4.ebuild,
+ -files/olsrd-0.5.4-build_fix.patch, -olsrd-0.5.5.ebuild,
+ -files/olsrd-0.5.5-build_fix.patch, -olsrd-0.5.6.ebuild:
+ ^
*olsrd-0.6.2 (07 Oct 2011)
diff --git a/net-misc/olsrd/files/olsrd-0.4.10-makefile.patch b/net-misc/olsrd/files/olsrd-0.4.10-makefile.patch
deleted file mode 100644
index 941d6d723920..000000000000
--- a/net-misc/olsrd/files/olsrd-0.4.10-makefile.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-diff -ru olsrd-0.4.10~/gui/linux-gtk/Makefile olsrd-0.4.10/gui/linux-gtk/Makefile
---- olsrd-0.4.10~/gui/linux-gtk/Makefile 2006-11-01 17:50:34.000000000 +0100
-+++ olsrd-0.4.10/gui/linux-gtk/Makefile 2006-11-01 17:51:27.000000000 +0100
-@@ -1,7 +1,7 @@
--CC= gcc
-+CC?= gcc
- #CC= arm-linux-gcc
-
--CFLAGS= -Wall `pkg-config --cflags gtk+-2.0` #-g #to use GDB
-+CFLAGS+= -Wall `pkg-config --cflags gtk+-2.0` #-g #to use GDB
- LFLAGS= `pkg-config --libs gtk+-2.0`
-
- SRCS= src/main.c src/interface.c src/callbacks.c src/ipc.c \
-@@ -23,4 +23,5 @@
- rm -f $(OBJS)
-
- install:
-- cp ./olsrd-gui /usr/bin/
-+ mkdir -p ${DESTDIR}/usr/bin
-+ cp ./olsrd-gui ${DESTDIR}/usr/bin/
-diff -ru olsrd-0.4.10~/make/Makefile.fbsd olsrd-0.4.10/make/Makefile.fbsd
---- olsrd-0.4.10~/make/Makefile.fbsd 2006-11-01 17:50:34.000000000 +0100
-+++ olsrd-0.4.10/make/Makefile.fbsd 2006-11-01 17:51:05.000000000 +0100
-@@ -2,12 +2,12 @@
- # FREEBSD SPECIFIC CONFIGURATION
- #
-
--INSTALL_PREFIX ?= /usr/local
--SBINDIR = $(INSTALL_PREFIX)/sbin
--ETCDIR = $(INSTALL_PREFIX)/etc
--LIBDIR = $(INSTALL_PREFIX)/lib
--DOCDIR = $(INSTALL_PREFIX)/share/doc
--MANDIR = $(INSTALL_PREFIX)/man
-+DESTDIR ?= /usr/local
-+SBINDIR = $(DESTDIR)/sbin
-+ETCDIR = $(DESTDIR)/etc
-+LIBDIR = $(DESTDIR)/lib
-+DOCDIR = $(DESTDIR)/share/doc
-+MANDIR = $(DESTDIR)/man
-
- SRCS += $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
- HDRS += $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h)
-@@ -22,8 +22,8 @@
-
- ifdef LIBNET
-
--CFLAGS += -DSPOOF -I$(INSTALL_PREFIX)/include
--LIBS += -L$(INSTALL_PREFIX)/lib -lnet
-+CFLAGS += -DSPOOF -I$(DESTDIR)/include
-+LIBS += -L$(DESTDIR)/lib -lnet
-
- endif
-
-diff -ru olsrd-0.4.10~/make/Makefile.linux olsrd-0.4.10/make/Makefile.linux
---- olsrd-0.4.10~/make/Makefile.linux 2006-11-01 17:50:34.000000000 +0100
-+++ olsrd-0.4.10/make/Makefile.linux 2006-11-01 17:51:05.000000000 +0100
-@@ -2,8 +2,8 @@
- # LINUX SPECIFIC CONFIGURATION
- #
-
--INSTALL_PREFIX ?=
--LIBDIR = $(INSTALL_PREFIX)/usr/lib
-+DESTDIR ?=
-+LIBDIR = $(DESTDIR)/usr/lib
-
- SRCS += $(wildcard src/linux/*.c) $(wildcard src/unix/*.c)
- HDRS += $(wildcard src/linux/*.h) $(wildcard src/unix/*.h)
-diff -ru olsrd-0.4.10~/make/Makefile.nbsd olsrd-0.4.10/make/Makefile.nbsd
---- olsrd-0.4.10~/make/Makefile.nbsd 2006-11-01 17:50:34.000000000 +0100
-+++ olsrd-0.4.10/make/Makefile.nbsd 2006-11-01 17:51:05.000000000 +0100
-@@ -2,8 +2,8 @@
- # NETBSD SPECIFIC CONFIGURATION
- #
-
--INSTALL_PREFIX ?=
--LIBDIR = $(INSTALL_PREFIX)/usr/lib
-+DESTDIR ?=
-+LIBDIR = $(DESTDIR)/usr/lib
-
- SRCS += $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
- HDRS += $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h)
-diff -ru olsrd-0.4.10~/make/Makefile.obsd olsrd-0.4.10/make/Makefile.obsd
---- olsrd-0.4.10~/make/Makefile.obsd 2006-11-01 17:50:34.000000000 +0100
-+++ olsrd-0.4.10/make/Makefile.obsd 2006-11-01 17:51:05.000000000 +0100
-@@ -2,8 +2,8 @@
- # OPENBSD SPECIFIC CONFIGURATION
- #
-
--INSTALL_PREFIX ?=
--LIBDIR = $(INSTALL_PREFIX)/usr/lib
-+DESTDIR ?=
-+LIBDIR = $(DESTDIR)/usr/lib
-
- SRCS += $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
- HDRS += $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h)
-diff -ru olsrd-0.4.10~/make/Makefile.osx olsrd-0.4.10/make/Makefile.osx
---- olsrd-0.4.10~/make/Makefile.osx 2006-11-01 17:50:34.000000000 +0100
-+++ olsrd-0.4.10/make/Makefile.osx 2006-11-01 17:51:05.000000000 +0100
-@@ -2,8 +2,8 @@
- # MAC OSX SPECIFIC CONFIGURATION
- #
-
--INSTALL_PREFIX ?=
--LIBDIR = $(INSTALL_PREFIX)/usr/lib
-+DESTDIR ?=
-+LIBDIR = $(DESTDIR)/usr/lib
-
- SRCS += $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
- HDRS += $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h)
-diff -ru olsrd-0.4.10~/make/Makefile.win32 olsrd-0.4.10/make/Makefile.win32
---- olsrd-0.4.10~/make/Makefile.win32 2006-11-01 17:50:34.000000000 +0100
-+++ olsrd-0.4.10/make/Makefile.win32 2006-11-01 17:51:05.000000000 +0100
-@@ -2,7 +2,7 @@
- # WINDOWS32 SPECIFIC CONFIGURATION
- #
-
--INSTALL_PREFIX ?=
-+DESTDIR ?=
- EXENAME = olsrd.exe
-
- SRCS += $(wildcard src/win32/*.c)
-diff -ru olsrd-0.4.10~/make/Makefile.wince olsrd-0.4.10/make/Makefile.wince
---- olsrd-0.4.10~/make/Makefile.wince 2006-11-01 17:50:34.000000000 +0100
-+++ olsrd-0.4.10/make/Makefile.wince 2006-11-01 17:51:05.000000000 +0100
-@@ -2,8 +2,8 @@
- # WINDOWS CE SPECIFIC CONFIGURATION
- #
-
--INSTALL_PREFIX ?=
--LIBDIR = $(INSTALL_PREFIX)/usr/lib
-+DESTDIR ?=
-+LIBDIR = $(DESTDIR)/usr/lib
-
- SRCS += $(wildcard src/win32/*.c)
- HDRS += $(wildcard src/win32/*.h)
-diff -ru olsrd-0.4.10~/Makefile.inc olsrd-0.4.10/Makefile.inc
---- olsrd-0.4.10~/Makefile.inc 2006-11-01 17:50:34.000000000 +0100
-+++ olsrd-0.4.10/Makefile.inc 2006-11-01 18:02:31.000000000 +0100
-@@ -1,17 +1,17 @@
- # programs
- CC ?= gcc
--STRIP ?= strip
-+STRIP ?= true
- BISON ?= bison
- FLEX ?= flex
- TAGCMD ?= etags
-
- # target directories and names
--#INSTALL_PREFIX =
--SBINDIR = $(INSTALL_PREFIX)/usr/sbin
--ETCDIR = $(INSTALL_PREFIX)/etc
--LIBDIR = $(INSTALL_PREFIX)/usr/lib
--DOCDIR = $(INSTALL_PREFIX)/usr/share/doc
--MANDIR = $(INSTALL_PREFIX)/usr/share/man
-+# DESTDIR =
-+SBINDIR = $(DESTDIR)/usr/sbin
-+ETCDIR = $(DESTDIR)/etc
-+LIBDIR = $(DESTDIR)/usr/lib
-+DOCDIR = $(DESTDIR)/usr/share/doc
-+MANDIR = $(DESTDIR)/usr/share/man
- CFGFILE = $(ETCDIR)/olsrd.conf
- EXENAME = olsrd
-
-diff -ru olsrd-0.4.10~/src/cfgparser/Makefile olsrd-0.4.10/src/cfgparser/Makefile
---- olsrd-0.4.10~/src/cfgparser/Makefile 2006-11-01 17:50:34.000000000 +0100
-+++ olsrd-0.4.10/src/cfgparser/Makefile 2006-11-01 18:17:04.000000000 +0100
-@@ -74,7 +74,7 @@
- LDFLAGS += -shared -Wl,-soname,$(LIBNAME)
- endif
-
--CFLAGS += -DMAKELIB
-+CFLAGS += -DMAKELIB -fPIC
- NAME = $(LIBNAME)
-
- endif
diff --git a/net-misc/olsrd/files/olsrd-0.4.10-memleak_in_olsr_remove_scheduler_event.patch b/net-misc/olsrd/files/olsrd-0.4.10-memleak_in_olsr_remove_scheduler_event.patch
deleted file mode 100644
index 7d0574d20204..000000000000
--- a/net-misc/olsrd/files/olsrd-0.4.10-memleak_in_olsr_remove_scheduler_event.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- olsrd-0.4.10~/src/scheduler.c 2006-07-28 16:09:26.000000000 +0200
-+++ olsrd-0.4.10/src/scheduler.c 2006-07-28 16:10:42.000000000 +0200
-@@ -329,6 +329,7 @@
- {
- prev->next = entry->next;
- }
-+ free(entry);
- return 1;
- }
-
diff --git a/net-misc/olsrd/files/olsrd-0.5.1-fix-hashing.patch b/net-misc/olsrd/files/olsrd-0.5.1-fix-hashing.patch
deleted file mode 100644
index 40dd61db90fe..000000000000
--- a/net-misc/olsrd/files/olsrd-0.5.1-fix-hashing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur olsrd-0.5.1.orig/src/hashing.c olsrd-0.5.1/src/hashing.c
---- olsrd-0.5.1.orig/src/hashing.c 2007-07-03 17:31:40.000000000 +0200
-+++ olsrd-0.5.1/src/hashing.c 2007-07-07 21:19:38.000000000 +0200
-@@ -54,7 +54,7 @@
- olsr_u32_t hash;
- if(olsr_cnf->ip_version == AF_INET) {
- /* IPv4 */
-- const olsr_u8_t * const v4x = (const char *)&address;
-+ const olsr_u8_t * const v4x = (const olsr_u8_t *)&address->v4;
- hash = v4x[0] ^ v4x[1] ^ v4x[2] ^ v4x[3];
- } else {
- /* IPv6 */
diff --git a/net-misc/olsrd/files/olsrd-0.5.2-bmf.patch b/net-misc/olsrd/files/olsrd-0.5.2-bmf.patch
deleted file mode 100644
index 9bea4b80142d..000000000000
--- a/net-misc/olsrd/files/olsrd-0.5.2-bmf.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -ru olsrd-0.5.2~/lib/bmf/src/Bmf.c olsrd-0.5.2/lib/bmf/src/Bmf.c
---- olsrd-0.5.2~/lib/bmf/src/Bmf.c 2007-07-29 13:41:15.000000000 +0200
-+++ olsrd-0.5.2/lib/bmf/src/Bmf.c 2007-07-31 20:45:52.000000000 +0200
-@@ -1451,19 +1451,22 @@
- RestoreSpoofFilter();
- }
-
-- /* Signal BmfThread to exit */
-- /* Strangely enough, all running threads receive the SIGALRM signal. But only the
-- * BMF thread is affected by this signal, having specified a handler for this
-- * signal in its thread entry function BmfRun(...). */
-- if (pthread_kill(BmfThread, SIGALRM) != 0)
-+ if (BmfThreadRunning)
- {
-- BmfPError("pthread_kill() error");
-- }
--
-- /* Wait for BmfThread to acknowledge */
-- if (pthread_join(BmfThread, NULL) != 0)
-- {
-- BmfPError("pthread_join() error");
-+ /* Signal BmfThread to exit */
-+ /* Strangely enough, all running threads receive the SIGALRM signal. But only the
-+ * BMF thread is affected by this signal, having specified a handler for this
-+ * signal in its thread entry function BmfRun(...). */
-+ if (pthread_kill(BmfThread, SIGALRM) != 0)
-+ {
-+ BmfPError("pthread_kill() error");
-+ }
-+
-+ /* Wait for BmfThread to acknowledge */
-+ if (pthread_join(BmfThread, NULL) != 0)
-+ {
-+ BmfPError("pthread_join() error");
-+ }
- }
-
- /* Clean up after the BmfThread has been killed */
-diff -ru olsrd-0.5.2~/Makefile.inc olsrd-0.5.2/Makefile.inc
---- olsrd-0.5.2~/Makefile.inc 2007-07-29 13:41:15.000000000 +0200
-+++ olsrd-0.5.2/Makefile.inc 2007-07-31 22:23:04.000000000 +0200
-@@ -64,6 +64,9 @@
- # options to save space on small systems
- DEFINES += -DSUPPORT_OLD_PLUGIN_VERSIONS=1
-
-+# we have plugins with the old interface
-+CPPFLAGS += -DSUPPORT_OLD_PLUGIN_VERSIONS=1
-+
- # search sources and headers in current dir and in src/
- SRCS = $(wildcard src/*.c)
- SRCS += $(wildcard *.c)
diff --git a/net-misc/olsrd/files/olsrd-0.5.4-build_fix.patch b/net-misc/olsrd/files/olsrd-0.5.4-build_fix.patch
deleted file mode 100644
index ae229a8b3e4d..000000000000
--- a/net-misc/olsrd/files/olsrd-0.5.4-build_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: olsrd-0.5.4/Makefile
-===================================================================
---- olsrd-0.5.4.orig/Makefile 2007-11-03 11:33:37.075400513 +0100
-+++ olsrd-0.5.4/Makefile 2007-11-03 11:33:47.171975883 +0100
-@@ -71,8 +71,6 @@
- $(CFGOBJS):
- $(MAKECMD) -C $(CFGDIR)
-
--# generate it always
--.PHONY: src/builddata.c
- src/builddata.c:
- @$(RM) "$@"
- @echo "#include \"defs.h\"" >> "$@"
diff --git a/net-misc/olsrd/files/olsrd-0.5.5-build_fix.patch b/net-misc/olsrd/files/olsrd-0.5.5-build_fix.patch
deleted file mode 100644
index 6c692796dc70..000000000000
--- a/net-misc/olsrd/files/olsrd-0.5.5-build_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru olsrd-a5b9cf969979~/Makefile olsrd-a5b9cf969979/Makefile
---- olsrd-a5b9cf969979~/Makefile 2008-02-17 12:55:49.000000000 +0100
-+++ olsrd-a5b9cf969979/Makefile 2008-02-17 12:58:50.000000000 +0100
-@@ -68,8 +68,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/olsrd-0.4.10.ebuild b/net-misc/olsrd/olsrd-0.4.10.ebuild
deleted file mode 100644
index b9a725c0046c..000000000000
--- a/net-misc/olsrd/olsrd-0.4.10.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/olsrd-0.4.10.ebuild,v 1.5 2008/02/17 12:15:28 cedk Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
-HOMEPAGE="http://www.olsr.org/"
-SRC_URI="http://www.olsr.org/releases/${PV%.*}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="x86"
-IUSE="gtk"
-
-DEPEND="gtk? ( =x11-libs/gtk+-2* )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}/${P}-makefile.patch"
- epatch "${FILESDIR}/${P}-memleak_in_olsr_remove_scheduler_event.patch"
-}
-
-src_compile() {
- emake OS=linux CC=$(tc-getCC) build_all || die "emake failed"
-
- if use gtk ; then
- cd "${S}/gui/linux-gtk"
- einfo "Building GUI ..."
- emake CC=$(tc-getCC) || die "emake failed"
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install_all || die "emake install_all failed"
-
- if use gtk; then
- cd "${S}/gui/linux-gtk"
- emake DESTDIR="${D}" install || die "emake install failed"
- fi
-
- doinitd "${FILESDIR}/olsrd"
-
- cd "${S}"
- dodoc CHANGELOG features.txt README README-Olsr-Switch.html \
- README-FreeBSD-libnet README-Link-Quality-Fish-Eye.txt \
- README-Link-Quality.html files/olsrd.conf.default.rfc \
- files/olsrd.conf.default.lq lib/dyn_gw/README_DYN_GW \
- lib/dot_draw/README_DOT_DRAW lib/httpinfo/README_HTTPINFO \
- lib/powerinfo/README_POWER
- newdoc lib/nameservice/README README-NAMESERVICE
- newdoc lib/secure/SOLSR-README README-SECURE
-}
diff --git a/net-misc/olsrd/olsrd-0.5.0.ebuild b/net-misc/olsrd/olsrd-0.5.0.ebuild
deleted file mode 100644
index 2362de86297e..000000000000
--- a/net-misc/olsrd/olsrd-0.5.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/olsrd-0.5.0.ebuild,v 1.3 2008/02/17 12:15:28 cedk Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
-HOMEPAGE="http://www.olsr.org/"
-SRC_URI="http://www.olsr.org/releases/${PV%.*}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~x86"
-IUSE="gtk"
-
-DEPEND="gtk? ( =x11-libs/gtk+-2* )"
-
-src_compile() {
- emake OS=linux CC=$(tc-getCC) build_all || die "emake failed"
-
- if use gtk ; then
- cd "${S}/gui/linux-gtk"
- einfo "Building GUI ..."
- emake CC=$(tc-getCC) || die "emake failed"
- fi
-}
-
-src_install() {
- emake OS=linux DESTDIR="${D}" STRIP=true install_all || die "emake install_all failed"
-
- if use gtk; then
- cd "${S}/gui/linux-gtk"
- emake DESTDIR="${D}" install || die "emake install failed"
- fi
-
- doinitd "${FILESDIR}/olsrd"
-
- cd "${S}"
- dodoc CHANGELOG features.txt README README-Olsr-Switch.html \
- README-FreeBSD-libnet README-Link-Quality-Fish-Eye.txt \
- README-Link-Quality.html files/olsrd.conf.default.rfc \
- files/olsrd.conf.default.lq lib/dyn_gw/README_DYN_GW \
- lib/dot_draw/README_DOT_DRAW lib/httpinfo/README_HTTPINFO \
- lib/powerinfo/README_POWER
- newdoc lib/nameservice/README README-NAMESERVICE
- newdoc lib/secure/SOLSR-README README-SECURE
-}
diff --git a/net-misc/olsrd/olsrd-0.5.1-r1.ebuild b/net-misc/olsrd/olsrd-0.5.1-r1.ebuild
deleted file mode 100644
index 1907a18af18e..000000000000
--- a/net-misc/olsrd/olsrd-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/olsrd-0.5.1-r1.ebuild,v 1.2 2008/02/17 12:15:28 cedk Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
-HOMEPAGE="http://www.olsr.org/"
-SRC_URI="http://www.olsr.org/releases/${PV%.*}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~x86"
-IUSE="gtk"
-
-DEPEND="gtk? ( =x11-libs/gtk+-2* )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/${P}-fix-hashing.patch"
-}
-
-src_compile() {
- emake OS=linux CC=$(tc-getCC) build_all || die "emake failed"
-
- if use gtk ; then
- cd "${S}/gui/linux-gtk"
- einfo "Building GUI ..."
- emake CC=$(tc-getCC) || die "emake failed"
- fi
-}
-
-src_install() {
- emake OS=linux DESTDIR="${D}" STRIP=true install_all || die "emake install_all failed"
-
- if use gtk; then
- cd "${S}/gui/linux-gtk"
- emake DESTDIR="${D}" install || die "emake install failed"
- fi
-
- doinitd "${FILESDIR}/olsrd"
-
- cd "${S}"
- dodoc CHANGELOG features.txt README README-Olsr-Switch.html \
- README-FreeBSD-libnet README-Link-Quality-Fish-Eye.txt \
- README-Link-Quality.html files/olsrd.conf.default.rfc \
- files/olsrd.conf.default.lq lib/bmf/README_BMF.txt \
- lib/dyn_gw/README_DYN_GW lib/dyn_gw_plain/README_DYN_GW_PLAIN \
- lib/dot_draw/README_DOT_DRAW 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
-}
diff --git a/net-misc/olsrd/olsrd-0.5.2-r1.ebuild b/net-misc/olsrd/olsrd-0.5.2-r1.ebuild
deleted file mode 100644
index 5b089d38eeeb..000000000000
--- a/net-misc/olsrd/olsrd-0.5.2-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/olsrd-0.5.2-r1.ebuild,v 1.2 2008/02/17 12:15:28 cedk Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
-HOMEPAGE="http://www.olsr.org/"
-SRC_URI="http://www.olsr.org/releases/${PV%.*}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~x86"
-IUSE="gtk"
-
-DEPEND="gtk? ( =x11-libs/gtk+-2* )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}/${P}-bmf.patch"
-}
-
-src_compile() {
- emake OS=linux CC=$(tc-getCC) build_all || die "emake failed"
-
- if use gtk ; then
- cd "${S}/gui/linux-gtk"
- einfo "Building GUI ..."
- emake CC=$(tc-getCC) || die "emake failed"
- fi
-}
-
-src_install() {
- emake OS=linux DESTDIR="${D}" STRIP=true install_all || die "emake install_all failed"
-
- if use gtk; then
- cd "${S}/gui/linux-gtk"
- emake DESTDIR="${D}" install || die "emake install failed"
- fi
-
- doinitd "${FILESDIR}/olsrd"
-
- cd "${S}"
- dodoc CHANGELOG features.txt README README-Olsr-Switch.html \
- README-FreeBSD-libnet README-Link-Quality-Fish-Eye.txt \
- README-Link-Quality.html files/olsrd.conf.default.rfc \
- files/olsrd.conf.default.lq lib/bmf/README_BMF.txt \
- lib/dyn_gw/README_DYN_GW lib/dyn_gw_plain/README_DYN_GW_PLAIN \
- lib/dot_draw/README_DOT_DRAW 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
-}
diff --git a/net-misc/olsrd/olsrd-0.5.3.ebuild b/net-misc/olsrd/olsrd-0.5.3.ebuild
deleted file mode 100644
index b633d46627e5..000000000000
--- a/net-misc/olsrd/olsrd-0.5.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/olsrd-0.5.3.ebuild,v 1.2 2008/02/17 12:15:28 cedk Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
-HOMEPAGE="http://www.olsr.org/"
-SRC_URI="http://www.olsr.org/releases/${PV%.*}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~x86"
-IUSE="gtk"
-
-DEPEND="gtk? ( =x11-libs/gtk+-2* )"
-
-src_compile() {
- emake OS=linux CC=$(tc-getCC) build_all || die "emake failed"
-
- if use gtk ; then
- cd "${S}/gui/linux-gtk"
- einfo "Building GUI ..."
- emake CC=$(tc-getCC) || die "emake failed"
- fi
-}
-
-src_install() {
- emake OS=linux DESTDIR="${D}" STRIP=true install_all || die "emake install_all failed"
-
- if use gtk; then
- cd "${S}/gui/linux-gtk"
- emake DESTDIR="${D}" install || die "emake install failed"
- fi
-
- doinitd "${FILESDIR}/olsrd"
-
- cd "${S}"
- dodoc CHANGELOG features.txt README README-Olsr-Switch.html \
- README-FreeBSD-libnet README-Link-Quality-Fish-Eye.txt \
- README-Link-Quality.html files/olsrd.conf.default.rfc \
- files/olsrd.conf.default.lq lib/bmf/README_BMF.txt \
- lib/dyn_gw/README_DYN_GW lib/dyn_gw_plain/README_DYN_GW_PLAIN \
- lib/dot_draw/README_DOT_DRAW 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
-}
diff --git a/net-misc/olsrd/olsrd-0.5.4.ebuild b/net-misc/olsrd/olsrd-0.5.4.ebuild
deleted file mode 100644
index 36d319a6cd9f..000000000000
--- a/net-misc/olsrd/olsrd-0.5.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/olsrd-0.5.4.ebuild,v 1.3 2007/12/08 23:06:15 cedk Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
-HOMEPAGE="http://www.olsr.org/"
-SRC_URI="http://www.olsr.org/releases/${PV%.*}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk"
-
-DEPEND="gtk? ( =x11-libs/gtk+-2* )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}/${P}-build_fix.patch"
-}
-
-src_compile() {
- emake OS=linux CC="$(tc-getCC)" build_all || die "emake failed"
-
- if use gtk ; then
- cd "${S}/gui/linux-gtk"
- einfo "Building GUI ..."
- emake CC="$(tc-getCC)" || die "emake failed"
- fi
-}
-
-src_install() {
- emake OS=linux DESTDIR="${D}" STRIP=true install_all || die "emake install_all failed"
-
- if use gtk; then
- cd "${S}/gui/linux-gtk"
- emake DESTDIR="${D}" install || die "emake install failed"
- fi
-
- doinitd "${FILESDIR}/olsrd"
-
- cd "${S}"
- dodoc CHANGELOG features.txt README README-Olsr-Switch.html \
- README-FreeBSD-libnet README-Link-Quality-Fish-Eye.txt \
- README-Link-Quality.html files/olsrd.conf.default.rfc \
- files/olsrd.conf.default.lq files/olsrd.conf.default.lq-fisheye \
- lib/arprefresh/README_ARPREFRESH \
- lib/bmf/README_BMF.txt \
- lib/dot_draw/README_DOT_DRAW.txt \
- 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
-}
diff --git a/net-misc/olsrd/olsrd-0.5.5.ebuild b/net-misc/olsrd/olsrd-0.5.5.ebuild
deleted file mode 100644
index 600dc15d9a74..000000000000
--- a/net-misc/olsrd/olsrd-0.5.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/olsrd-0.5.5.ebuild,v 1.1 2008/02/17 12:10:27 cedk Exp $
-
-inherit eutils toolchain-funcs
-
-MY_P=${PN}-a5b9cf969979
-
-DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
-HOMEPAGE="http://www.olsr.org/"
-SRC_URI="http://www.olsr.org/releases/${PV%.*}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk"
-DEPEND="gtk? ( =x11-libs/gtk+-2* )"
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/${P}-build_fix.patch"
-}
-
-src_compile() {
- emake OS=linux CC="$(tc-getCC)" build_all || die "emake failed"
-
- if use gtk ; then
- cd "${S}/gui/linux-gtk"
- einfo "Building GUI ..."
- emake CC="$(tc-getCC)" || die "emake failed"
- fi
-}
-
-src_install() {
- emake OS=linux DESTDIR="${D}" STRIP=true install_all || die "emake install_all failed"
-
- if use gtk; then
- cd "${S}/gui/linux-gtk"
- emake DESTDIR="${D}" install || die "emake install failed"
- fi
-
- doinitd "${FILESDIR}/olsrd"
-
- cd "${S}"
- dodoc CHANGELOG features.txt README README-Olsr-Switch.html \
- README-FreeBSD-libnet README-Link-Quality-Fish-Eye.txt \
- README-Link-Quality.html files/olsrd.conf.default.rfc \
- files/olsrd.conf.default.lq files/olsrd.conf.default.lq-fisheye \
- lib/arprefresh/README_ARPREFRESH \
- lib/bmf/README_BMF.txt \
- 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
-}
diff --git a/net-misc/olsrd/olsrd-0.5.6.ebuild b/net-misc/olsrd/olsrd-0.5.6.ebuild
deleted file mode 100644
index 14a89c33383b..000000000000
--- a/net-misc/olsrd/olsrd-0.5.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/olsrd-0.5.6.ebuild,v 1.2 2008/10/27 20:30:12 maekke Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
-HOMEPAGE="http://www.olsr.org/"
-SRC_URI="http://www.olsr.org/releases/0.5/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 x86"
-IUSE="gtk"
-DEPEND="gtk? ( =x11-libs/gtk+-2* )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/${PN}-0.5.5-build_fix.patch"
-}
-
-src_compile() {
- emake OS=linux CC="$(tc-getCC)" build_all || die "emake failed"
-
- if use gtk ; then
- cd "${S}/gui/linux-gtk"
- einfo "Building GUI ..."
- emake CC="$(tc-getCC)" || die "emake failed"
- fi
-}
-
-src_install() {
- emake OS=linux DESTDIR="${D}" STRIP=true install_all || die "emake install_all failed"
-
- if use gtk; then
- cd "${S}/gui/linux-gtk"
- emake DESTDIR="${D}" install || die "emake install failed"
- fi
-
- doinitd "${FILESDIR}/olsrd"
-
- cd "${S}"
- dodoc CHANGELOG features.txt README README-Olsr-Switch.html \
- README-FreeBSD-libnet README-Link-Quality-Fish-Eye.txt \
- README-Link-Quality.html 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.txt \
- 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
-}