net-libs/libvuurmuur: Improved ebuild for bug 115696

svn path=/sunrise/; revision=9708

diff --git a/net-libs/libvuurmuur/ChangeLog b/net-libs/libvuurmuur/ChangeLog
index fd90060da77f10c01a102608fc931c9cd138a713..24f122f68fbd046db2d49d69582b2512ec1bd5b3 100644 (file)
--- a/net-libs/libvuurmuur/ChangeLog
+++ b/net-libs/libvuurmuur/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Dec 2009; Sven Schwyn (svoop) <gentoo@bitcetera.com>
+  libvuurmuur-0.8_beta2.ebuild:
+  Improved ebuild for bug 115696
+
   01 Dec 2009; Sven Schwyn (svoop) <gentoo@bitcetera.com>
   +files/libvuurmuur-plugin-0.7.patch, +libvuurmuur-0.8_beta2.ebuild,
   +metadata.xml:

diff --git a/net-libs/libvuurmuur/Manifest b/net-libs/libvuurmuur/Manifest
index ea8e0892b5c87585b4df88079aed7b0bd6ab7b62..b391fa7b02ae788370b786c88286f1755df30eea 100644 (file)
--- a/net-libs/libvuurmuur/Manifest
+++ b/net-libs/libvuurmuur/Manifest
@@ -1,5 +1,5 @@
 AUX libvuurmuur-plugin-0.7.patch 2156 RMD160 f9bdac8370cd622976e4e4fb1fdd056cb188efcf SHA1 97adbdc59a05cf005d81b355c84a49e08ce558a1 SHA256 7ca0c55fb25720f7044ceac2129b928180301c6d7c7be1bf2c8e873d492c1ef1
 DIST Vuurmuur-0.8beta2.tar.gz 1877270 RMD160 d1f202adb5ab076ea7763c215faec2558100d5b6 SHA1 549cc3b7d8c86cac0cbccbb963a3b3d041e8ea70 SHA256 4c74de94698a0a4bca758322b5e4198afc27fb25401309a7ecff445742f28d0e
-EBUILD libvuurmuur-0.8_beta2.ebuild 1108 RMD160 36172bf4e1efe4b025fd238386a3db6dc4d935de SHA1 a6efc4b015403ec5a656c582d8602d19f16e6af3 SHA256 a04377dfec7f91f12a8402db81fef13634eb715746cde11f50db170fad350f04
-MISC ChangeLog 327 RMD160 606b82c164204411e3b57637b29b8fdd3e434da5 SHA1 5c7b5dce27cdf1a24c6fb16ff7eb94bd17c19a4a SHA256 f46e67ac7c8135b1ce4d835c7e40e7cbd1e26b67df83a05c6d5470b348525c3e
+EBUILD libvuurmuur-0.8_beta2.ebuild 1084 RMD160 bafa556e9b4c7a562fbb2cfc89e3f834d0d2add0 SHA1 8cc92555843e15f90d4226d381f1dcc490a28715 SHA256 44c4e5b69c78372c90a9bafd7cb332027789e0fe022b93a27b3427e3200cae86
+MISC ChangeLog 451 RMD160 7795c5d96afe4810820e60606b3d1a67a1c8baba SHA1 b1b90546f52b8d147bc2f0ce426a22efad51b007 SHA256 38d46b189ad9f2f11bb1cd13db9e60e0dc7268d751039a045c67c744ff55d18f
 MISC metadata.xml 790 RMD160 0f23c1c2f5bed1db9ddd37e73b2f848017fc588d SHA1 492c2745cfd7c2442e5a6fab50383b23efacddb9 SHA256 8fc499b7bd99a35ec4a841ee747405426fef946bf8c660a51f58045a5fc75eac

diff --git a/net-libs/libvuurmuur/libvuurmuur-0.8_beta2.ebuild b/net-libs/libvuurmuur/libvuurmuur-0.8_beta2.ebuild
index 706f08533b1a79144bc49d909fe56ccc45f41535..7696996f52601a5b409f33b900779b439a533153 100644 (file)
--- a/net-libs/libvuurmuur/libvuurmuur-0.8_beta2.ebuild
+++ b/net-libs/libvuurmuur/libvuurmuur-0.8_beta2.ebuild
@@ -4,40 +4,38 @@
 
 EAPI="2"
 
-inherit autotools
+inherit autotools multilib
 
-MY_PN="Vuurmuur"
 MY_PV=${PV/_beta/beta}
-MY_P="${MY_PN}-${MY_PV}"
+MY_P="Vuurmuur-${MY_PV}"
 
-DESCRIPTION="Libraries and plugins needed by Vuurmuur"
+DESCRIPTION="Libraries and plugins required by Vuurmuur"
 HOMEPAGE="http://www.vuurmuur.org"
 SRC_URI="ftp://ftp.vuurmuur.org/releases/${MY_PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="net-firewall/iptables"
+DEPEND="net-firewall/iptables"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}/${PN}-${MY_PV}"
 
 src_unpack() {
-       unpack ${A}
+       default
        cd "${MY_P}"
        unpack "./libvuurmuur-${MY_PV}.tar.gz"
 }
 
 src_prepare() {
-       epatch "${FILESDIR}"/libvuurmuur-plugin-0.7.patch   # no longer needed as of >0.8_beta2
+       epatch "${FILESDIR}"/libvuurmuur-plugin-0.7.patch   # no longer needed for >0.8_beta2
        eautoreconf
 }
 
 src_configure() {
-       econf \
-               --with-plugindir=/usr/lib \
-               --with-shareddir=/usr/share
+       econf --with-plugindir=/usr/$(get_libdir)
 }
 
 src_install() {