Version bump.

Package-Manager: portage-2.2.0_alpha113/cvs/Linux x86_64

8 files changed, 65 insertions, 170 deletions

diff --git a/net-misc/olsrd/ChangeLog b/net-misc/olsrd/ChangeLog
index 7fe477f605a9..05cd24ee362e 100644
--- a/net-misc/olsrd/ChangeLog
+++ b/net-misc/olsrd/ChangeLog
@@ -1,6 +1,14 @@
 # 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.28 2012/04/22 12:05:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/ChangeLog,v 1.29 2012/06/28 01:53:08 jer Exp $
+
+*olsrd-0.6.3 (28 Jun 2012)
+
+  28 Jun 2012; Jeroen Roovers <jer@gentoo.org> -olsrd-0.5.6.7.ebuild,
+  -files/olsrd-0.5.6.7-build_fix.patch, -olsrd-0.6.1.ebuild,
+  files/olsrd-0.6.1-build_fix.patch, -olsrd-0.6.2.ebuild, +olsrd-0.6.3.ebuild,
+  +files/olsrd-0.6.3-make-gtk.patch:
+  Version bump.
 
   22 Apr 2012; Markus Meier <maekke@gentoo.org> olsrd-0.6.2-r1.ebuild:
   x86 stable, bug #333827
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index 6e58c88557d3..0ab85a9e5f07 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -2,21 +2,18 @@
 Hash: SHA1
 
 AUX olsrd 478 RMD160 7de06122dcde158e14e453bfde0bf5a9e7da1d47 SHA1 b225c82ea8b78a0ec42d46397d22df61a0ddf5ea SHA256 24b7132e606e40c2d529a5b3bd2b61390925099db81687341464c20bfc597676
-AUX olsrd-0.5.6.7-build_fix.patch 365 RMD160 9830c815f1fbd189a561cc6fddad3ad40c7ba40c SHA1 333d0b4f1a761131adfb7e5ea543190617d56b8d SHA256 a2e452dca945e6e667304abb9c9a90318381ceaaf6c371640ad4bfd97818b9f7
-AUX olsrd-0.6.1-build_fix.patch 353 RMD160 08b4d220240ce4e3bfbdf2387642814e2939ab52 SHA1 37c2495b58d16ecb39740690aa1591f6087e681b SHA256 82ab3fbc7db1a189079306bc0cae4066186281860c2189d0df0b72cb33167a7f
-DIST olsrd-0.5.6-r7.tar.bz2 548784 RMD160 f3c8e9b70cf75ea3142c57bdc6e997a0d754e3fe SHA1 4382592309f50043e509e9b6a1024818bf749605 SHA256 ff10d93035f566ab3ed7557efb54ad88aa98b52c5835ac0fde6ba638b00c3a0c
-DIST olsrd-0.6.1.tar.bz2 643250 RMD160 fdb14e71f885bcc82d8377b32122d5231bc9e019 SHA1 1a6d00c8b48fec69353709cda7cfad7f1e260f69 SHA256 03d359b65711ef7bf235bf530d2afe61eeae3cbf3f8e60ddf2c14e68f3b48f9f
+AUX olsrd-0.6.1-build_fix.patch 208 RMD160 dd119e4b8c183d1a26b632726682627608c52ce7 SHA1 69ba8b58cb0538f768c64f4622fbd5db45abc8d3 SHA256 6a5f911361014bf687c7223015c0b4d8cff47b92b711cee75d2210a97704513a
+AUX olsrd-0.6.3-make-gtk.patch 629 RMD160 f44c257b8f7d983adfea37596236f7f879e3929b SHA1 5b3c01732036b53e19c158fdfc608a0ba86c459d SHA256 7f7a3d93194a598ecd265831c83b3a6c1afb56398594694daf7a777551a88d08
 DIST olsrd-0.6.2.tar.bz2 650727 RMD160 4661faaab929260bc159c725f6c834a8d0bb0003 SHA1 0babcd891d32b5d54f2708f469d2fe4e9cdd81d8 SHA256 2ebf5a1054e1cd49b54bb2b226a679328d0bd0d863dddcd01ef7e9e525b80374
-EBUILD olsrd-0.5.6.7.ebuild 1891 RMD160 dadb04b289cbc3f1492ef0c4408985ac472a374f SHA1 3c70ffcf81b344c0aa2dceb2b324245e78928140 SHA256 c47f5a21ca99171a448fb0fd5d02459044fdadf57830f568efcff6e380828157
-EBUILD olsrd-0.6.1.ebuild 1750 RMD160 4bac1363c6bf6499414e8b7a6e52f24eeaf277af SHA1 ed73eec1efc1a06148229e7d5cb2ec5a11c7de0c SHA256 8a31bd989c8b9de346cfbe7b554c2ce249508a119b60a071ac6fdea48bdfd5b0
+DIST olsrd-0.6.3.tar.bz2 5447995 RMD160 38d1feb8bf74b55dd8a37bd306d9041fbc83ed79 SHA1 d949a46904e2c2ff694e8350cc5bbffb26d5011b SHA256 ef31bb604859737437019e282650b8292515b7a4789b432aae6c42393ab7b9ca
 EBUILD olsrd-0.6.2-r1.ebuild 1960 RMD160 f7c4d81ede9238e371e7814c305d74152a3076b6 SHA1 6764f888b4f96a16e5971e0c5bc8e9a6870e9d6d SHA256 94cd11e4055da7aeb54420105b585315630677a8631c252957919a02a9367b9e
-EBUILD olsrd-0.6.2.ebuild 1727 RMD160 2a627c7e5d804edecc2057565d5f9907bf000bf9 SHA1 375cd51039730492c36b85116cd7fcfa0cddb36e SHA256 d4f37fe1377a112f77b1d4502a996f77574da28bcdbcb1260bab6b969551225a
-MISC ChangeLog 4309 RMD160 9f6c93956fc26866d732045b5921804e05dcfbb8 SHA1 d24b9bf15f30e14e2baa5f82fb13f02394ebf205 SHA256 55194f9ff7c45d7664b14a4a837cfd113de10208d8b2e890f98edc355bee87b4
+EBUILD olsrd-0.6.3.ebuild 1833 RMD160 a457983f05e1b2481a957b3d62f997404a1e6f76 SHA1 5fad97d377cf46213bcd40c2494a00947dfde71f SHA256 f27d5afa963576f30fec024f17144a6fdd22ae257e38e5b23ad23463aef06564
+MISC ChangeLog 4598 RMD160 50f2b55c93311b82b8677614a6fdd8823e5d9142 SHA1 269372d9b429949d8b478848376ee6e7d4458fc3 SHA256 70629609f40183b695594335e0136ffce885734f12913e92043629b0a7751ad5
 MISC metadata.xml 297 RMD160 d3d098caf90098dcf7fc21916b96d843472306df SHA1 78b005bc8c26c95e3a6fa0d82ba6adec50cee7c8 SHA256 7eb2efdb97b502f400b391fb3758ded6a0283bf514acc11efa86702fed847f5b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+T9LIACgkQkKaRLQcq0GLu0wCeKJPzmBhIkZSQwxB0XHRw43Tt
-eM4Ani5UHrclci6Pjd3ORYjBj7ZQr6nz
-=kWZp
+iEYEARECAAYFAk/ruQkACgkQVWmRsqeSphM5tQCdHLMtWwcFKrhvDmS5CggE6vdY
+wbAAn1qCJqQuyMMN8ThxtP8tvOjHWgS2
+=oA5g
 -----END PGP SIGNATURE-----
diff --git a/net-misc/olsrd/files/olsrd-0.5.6.7-build_fix.patch b/net-misc/olsrd/files/olsrd-0.5.6.7-build_fix.patch
deleted file mode 100644
index adcea5d3bb39..000000000000
--- a/net-misc/olsrd/files/olsrd-0.5.6.7-build_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru olsrd-0.5.6-r7~/Makefile olsrd-0.5.6-r7/Makefile
---- olsrd-0.5.6-r7~/Makefile	2009-12-19 21:03:41.000000000 +0100
-+++ olsrd-0.5.6-r7/Makefile	2009-12-19 21:04:00.000000000 +0100
-@@ -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.1-build_fix.patch b/net-misc/olsrd/files/olsrd-0.6.1-build_fix.patch
index 48b6b2b1d27b..9a8683e9d3e8 100644
--- a/net-misc/olsrd/files/olsrd-0.6.1-build_fix.patch
+++ b/net-misc/olsrd/files/olsrd-0.6.1-build_fix.patch
@@ -1,6 +1,5 @@
-diff -ru olsrd-0.6.1~/Makefile olsrd-0.6.1/Makefile
---- olsrd-0.6.1~/Makefile	2011-01-06 23:29:17.000000000 +0100
-+++ olsrd-0.6.1/Makefile	2011-01-06 23:32:36.000000000 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -71,8 +71,6 @@
  switch:		
  	$(MAKECMD) -C $(SWITCHDIR)
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
new file mode 100644
index 000000000000..12e983daca41
--- /dev/null
+++ b/net-misc/olsrd/files/olsrd-0.6.3-make-gtk.patch
@@ -0,0 +1,22 @@
+--- 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.5.6.7.ebuild b/net-misc/olsrd/olsrd-0.5.6.7.ebuild
deleted file mode 100644
index 3e925bd68b97..000000000000
--- a/net-misc/olsrd/olsrd-0.5.6.7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 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.7.ebuild,v 1.3 2010/04/06 07:21:23 hwoarang Exp $
-
-inherit eutils 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? ( =x11-libs/gtk+-2* )"
-RDEPEND=$DEPEND
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.5.6.7-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 \
-		lib/watchdog/README_WATCHDOG
-}
diff --git a/net-misc/olsrd/olsrd-0.6.1.ebuild b/net-misc/olsrd/olsrd-0.6.1.ebuild
deleted file mode 100644
index aaa74bbe8665..000000000000
--- a/net-misc/olsrd/olsrd-0.6.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/olsrd-0.6.1.ebuild,v 1.1 2011/01/06 22:43:26 cedk Exp $
-
-inherit eutils 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? ( =x11-libs/gtk+-2* )"
-RDEPEND=$DEPEND
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-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 \
-		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 \
-		lib/watchdog/README_WATCHDOG
-}
diff --git a/net-misc/olsrd/olsrd-0.6.2.ebuild b/net-misc/olsrd/olsrd-0.6.3.ebuild
index e4b6ba401c40..489d87e954cc 100644
--- a/net-misc/olsrd/olsrd-0.6.2.ebuild
+++ b/net-misc/olsrd/olsrd-0.6.3.ebuild
@@ -1,10 +1,9 @@
 # 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.ebuild,v 1.2 2012/02/15 14:58:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/olsrd-0.6.3.ebuild,v 1.1 2012/06/28 01:53:08 jer Exp $
 
-EAPI="4"
-
-inherit eutils toolchain-funcs versionator
+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"
@@ -15,27 +14,36 @@ SLOT="0"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~x86"
 IUSE="gtk"
-DEPEND="gtk? ( =x11-libs/gtk+-2* )"
+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
+	epatch \
+		"${FILESDIR}/${PN}-0.6.1-build_fix.patch" \
+		"${FILESDIR}/${P}-make-gtk.patch"
 }
 
 src_compile() {
-	emake OS=linux CC="$(tc-getCC)" build_all
-	use gtk && emake -C "${S}/gui/linux-gtk" CC="$(tc-getCC)"
+	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 DESTDIR="${D}" STRIP=true install_all
-	use gtk && emake -C "${S}/gui/linux-gtk" DESTDIR="${D}" 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"