summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2013-06-01 12:22:39 +0000
committerPacho Ramos <pacho@gentoo.org>2013-06-01 12:22:39 +0000
commit2e6ba542833fa1d9b5affec8c4d58fec435cd1a2 (patch)
treea6b22fc3b25dbd8aaacf922b3650c3cf71eb08bd /net-misc/olsrd
parentCleanup due bug #151880 (diff)
downloadgentoo-2-2e6ba542833fa1d9b5affec8c4d58fec435cd1a2.tar.gz
gentoo-2-2e6ba542833fa1d9b5affec8c4d58fec435cd1a2.tar.bz2
gentoo-2-2e6ba542833fa1d9b5affec8c4d58fec435cd1a2.zip
Cleanup due bug #151880
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'net-misc/olsrd')
-rw-r--r--net-misc/olsrd/ChangeLog9
-rw-r--r--net-misc/olsrd/metadata.xml2
-rw-r--r--net-misc/olsrd/olsrd-0.6.2-r1.ebuild69
3 files changed, 7 insertions, 73 deletions
diff --git a/net-misc/olsrd/ChangeLog b/net-misc/olsrd/ChangeLog
index dd6e260fe248..729708124bfe 100644
--- a/net-misc/olsrd/ChangeLog
+++ b/net-misc/olsrd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/olsrd
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/ChangeLog,v 1.32 2012/11/15 16:50:37 jer Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/ChangeLog,v 1.33 2013/06/01 12:22:39 pacho Exp $
+
+ 01 Jun 2013; Pacho Ramos <pacho@gentoo.org> -olsrd-0.6.2-r1.ebuild,
+ metadata.xml:
+ Cleanup due bug #151880
*olsrd-0.6.4 (15 Nov 2012)
@@ -154,4 +158,3 @@
New Ebuild for bug #76646 thanks to Daniel Webert, Maximilian Bauer, Stefan
Schweizer, Andre Kloth, Petteri Räty, phaidros, Dirk-Lüder Kreie,
Christian Ludwig
-
diff --git a/net-misc/olsrd/metadata.xml b/net-misc/olsrd/metadata.xml
index 9fb036965485..19e9f85b04fb 100644
--- a/net-misc/olsrd/metadata.xml
+++ b/net-misc/olsrd/metadata.xml
@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
- <email>cedk@gentoo.org</email>
+ <email>maintainer-needed@gentoo.org</email>
</maintainer>
<longdescription>An implementation of the Optimized Link State Routing protocol</longdescription>
</pkgmetadata>
diff --git a/net-misc/olsrd/olsrd-0.6.2-r1.ebuild b/net-misc/olsrd/olsrd-0.6.2-r1.ebuild
deleted file mode 100644
index 815b8e638ee5..000000000000
--- a/net-misc/olsrd/olsrd-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/olsrd-0.6.2-r1.ebuild,v 1.3 2012/04/22 12:05:16 maekke Exp $
-
-EAPI=4
-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"
-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"
- sed -i gui/linux-gtk/Makefile \
- -e 's|LFLAGS|LDFLAGS|g;' \
- -e 's|$(CC).*|$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)|g' \
- -e '/^LDFLAGS/s|=|+= -lm|g' \
- || die
-}
-
-src_compile() {
- emake LIBDIR="/usr/$(get_libdir)/${PN}" OS=linux CC="$(tc-getCC)" 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}/olsrd"
-
- 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
-}