From 67e2026c38c4334b5b3f9da8352e514335d8a8ce Mon Sep 17 00:00:00 2001 From: "Sven Schwyn (svoop)" Date: Fri, 11 Dec 2009 22:39:32 +0000 Subject: net-firewall/vuurmuur: Improved ebuild for bug 115697 svn path=/sunrise/; revision=9709 --- net-firewall/vuurmuur/ChangeLog | 4 ++ net-firewall/vuurmuur/Manifest | 4 +- net-firewall/vuurmuur/vuurmuur-0.8_beta2.ebuild | 59 +++++++++---------------- 3 files changed, 27 insertions(+), 40 deletions(-) (limited to 'net-firewall') diff --git a/net-firewall/vuurmuur/ChangeLog b/net-firewall/vuurmuur/ChangeLog index 7d96ae04e..56a787ee2 100644 --- a/net-firewall/vuurmuur/ChangeLog +++ b/net-firewall/vuurmuur/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 11 Dec 2009; Sven Schwyn (svoop) + vuurmuur-0.8_beta2.ebuild: + Improved ebuild for bug 115697 + 01 Dec 2009; Sven Schwyn (svoop) +vuurmuur-0.8_beta2.ebuild, +files/vuurmuur.conf, +files/vuurmuur.init, +metadata.xml: diff --git a/net-firewall/vuurmuur/Manifest b/net-firewall/vuurmuur/Manifest index d072cb6c1..886569c41 100644 --- a/net-firewall/vuurmuur/Manifest +++ b/net-firewall/vuurmuur/Manifest @@ -1,6 +1,6 @@ AUX vuurmuur.conf 311 RMD160 dc84e54dedc8db14d75cafaa8ab7098d75da104f SHA1 0f078fa4e563723998e348cd41ee47a274626ad3 SHA256 1724514ca6fed00ad42dabdebe43d095c12bb007b4382f6358135b99373a7466 AUX vuurmuur.init 1257 RMD160 66087fa191a5a344d6671ff4aec2fb2f0315fc2d SHA1 7883be040d44ab925425c5eb2994dc85dbf5c7d4 SHA256 3179f7092f180a5287a6d0ed4519313df762f25a4de50acc376c5905729e0cae DIST Vuurmuur-0.8beta2.tar.gz 1877270 RMD160 d1f202adb5ab076ea7763c215faec2558100d5b6 SHA1 549cc3b7d8c86cac0cbccbb963a3b3d041e8ea70 SHA256 4c74de94698a0a4bca758322b5e4198afc27fb25401309a7ecff445742f28d0e -EBUILD vuurmuur-0.8_beta2.ebuild 2565 RMD160 ccde772f6e32650da3af62e72623d3d40fc6bc5c SHA1 f40c074c796685fd2d67b62b2ecb38e697a2a438 SHA256 07bdcbaf82dd2346c58374f19e1a64a9d1256d5f2a9f5b69a90d882f9bcde6b0 -MISC ChangeLog 332 RMD160 04c823a02b57ca3de23e66549a33924fe11d8160 SHA1 136ce62dffe7aa780f4b6334feac82f6a0d6e0a3 SHA256 e11616ec626d7f5fae5d597fc06531d20f105397e06d3f07b88a571a9d2eaa26 +EBUILD vuurmuur-0.8_beta2.ebuild 2241 RMD160 f34023ad0583bc2263bc2eaaec9bb2629944d84d SHA1 c1e5b4a2629bd4a8da8963a5b9c139e873ed2117 SHA256 90d4386aac88dead612c2414f99be228e0831bc0f73f4f95d2927e24e2d49dbb +MISC ChangeLog 453 RMD160 da74b6f7a89d64820d6201f79e35676a728225c4 SHA1 d26288fafe77a26da69945c37226efcda8b94ab1 SHA256 7272e60b0e9570eefe03684a6f2e579171afad239a1b045ee1d023cce4f0548f MISC metadata.xml 787 RMD160 7ba4b9181ee7ed0262274384606004f8fdc539f4 SHA1 1e0fd15989864731c442dd578c6fa9b9bc12c824 SHA256 56cd2a24a3a44c4031dd1530e75f6fe1adfda60d399870312f1989a57181ae56 diff --git a/net-firewall/vuurmuur/vuurmuur-0.8_beta2.ebuild b/net-firewall/vuurmuur/vuurmuur-0.8_beta2.ebuild index 4cd218534..b36b95cbc 100644 --- a/net-firewall/vuurmuur/vuurmuur-0.8_beta2.ebuild +++ b/net-firewall/vuurmuur/vuurmuur-0.8_beta2.ebuild @@ -4,11 +4,10 @@ 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="Frontend for iptables featuring easy to use command line utils, rule- and logdaemons" HOMEPAGE="http://www.vuurmuur.org" @@ -16,75 +15,59 @@ 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="logrotate" -RDEPEND="=net-libs/libvuurmuur-${PV} - >=sys-libs/ncurses-5 +DEPEND="=net-libs/libvuurmuur-${PV} + >=sys-libs/ncurses-5" +RDEPEND="${DEPEND} logrotate? ( app-admin/logrotate )" -S="${WORKDIR}/${MY_P}" +S="${WORKDIR}/${MY_P}/${PN}-${MY_PV}" src_unpack() { - unpack ${A} - cd "${S}" + default + cd ${MY_P} for component in vuurmuur vuurmuur_conf; do - unpack "./${component}-${MY_PV}.tar.gz" - done -} - -src_prepare() { - for component in vuurmuur vuurmuur_conf; do - cd "${S}/${component}-${MY_PV}" - eautoreconf + unpack "./${component}-${MY_PV}.tar.gz" # upstream supplies tarball inside tarball done } src_configure() { - cd "${S}/vuurmuur-${MY_PV}" econf \ --with-libvuurmuur-includes=/usr/include \ - --with-libvuurmuur-libraries=/usr/lib - - cd "${S}/vuurmuur_conf-${MY_PV}" + --with-libvuurmuur-libraries=/usr/$(get_libdir) + cd "../vuurmuur_conf-${MY_PV}" econf \ --with-libvuurmuur-includes=/usr/include \ - --with-libvuurmuur-libraries=/usr/lib \ + --with-libvuurmuur-libraries=/usr/$(get_libdir) \ --with-localedir=/usr/share/locale \ --with-widec=yes } src_compile() { - for component in vuurmuur vuurmuur_conf; do - cd "${S}/${component}-${MY_PV}" - emake || die "compiling ${component} failed" - done + default + emake -C "../vuurmuur_conf-${MY_PV}" || die "compiling vuurmuur_conf failed" } src_install() { - cd "${S}/vuurmuur-${MY_PV}" emake DESTDIR="${D}" install || die "installing vuurmuur failed" newinitd "${FILESDIR}"/vuurmuur.init vuurmuur || die "installing init failed" newconfd "${FILESDIR}"/vuurmuur.conf vuurmuur || die "installing conf failed" - - insopts -m0600 - insinto /etc/vuurmuur - newins config/config.conf.sample config.conf || die "installing config.conf failed" - insopts -m0644 if use logrotate; then insinto /etc/logrotate.d newins scripts/vuurmuur-logrotate vuurmuur || die "installing logrotate config failed" fi - cd "${S}/vuurmuur_conf-${MY_PV}" + insopts -m0600 + insinto /etc/vuurmuur + newins config/config.conf.sample config.conf || die "installing config.conf failed" + + cd "../vuurmuur_conf-${MY_PV}" + emake DESTDIR="${D}" install || die "installing vuurmuur_conf failed" - - # needed until the wizard scripts are copied by make - insopts -m0755 - insinto /usr/share/scripts - doins scripts/*.sh || die "installing vuurmuur scripts failed" } pkg_postinst() { -- cgit v1.2.3-65-gdbad