summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/moblock/ChangeLog6
-rw-r--r--net-misc/moblock/Manifest6
-rw-r--r--net-misc/moblock/metadata.xml1
-rw-r--r--net-misc/moblock/moblock-0.8-r2.ebuild30
4 files changed, 19 insertions, 24 deletions
diff --git a/net-misc/moblock/ChangeLog b/net-misc/moblock/ChangeLog
index 87b4151f1..28a653078 100644
--- a/net-misc/moblock/ChangeLog
+++ b/net-misc/moblock/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 05 Sep 2009; Daniel Santos (dansan) <daniel.santos@pobox.com>
+ moblock-0.8-r2.ebuild, metadata.xml:
+ * Removed paranoid USE flag
+ * Re-added app-admin/logrotate to RDEPEND
+ * Fixed quoted text intended for bash expansion
+
04 Sep 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
moblock-0.8-r2.ebuild:
Cleanup, fix pkg_postrm check
diff --git a/net-misc/moblock/Manifest b/net-misc/moblock/Manifest
index 81a9dd6a2..ebabbecc8 100644
--- a/net-misc/moblock/Manifest
+++ b/net-misc/moblock/Manifest
@@ -10,6 +10,6 @@ AUX moblock-0.8-fix-nfq_unbind_pf-error.patch 615 RMD160 59734a3e704b12abbaacef0
AUX moblock-0.8-makefile.patch 853 RMD160 db5143301e9bead74090d42f9e66936ebc96417d SHA1 119e587f5f50964214c0bfd45ce844e5a95ac41c SHA256 927c6b7da2ef2bbe522f6a530125ee0d6235e052d6f81b1405b6e913f431bbb0
AUX moblock-0.8-rename-stats-file.patch 2051 RMD160 e7e395ffef153e72640b0b98fbc65ba28652230f SHA1 3917f61cc1cb40ca952e37d088c8eb7de5b4aff2 SHA256 cd63be8f9783ee4254e7eac8524888fc3b240cb8c2f3d4fa3e9d50dc27a4f173
DIST MoBlock-0.8-i586.tar.bz2 18553 RMD160 2190cfb55977ad23176ddb43e410ee5d9293a518 SHA1 e9e7b47622eb606b6c429fc507fc50d0c037487e SHA256 30d6d56fe72606ffa308fb8e6edd44c2b1806dfa4da8a13bde046964601fd904
-EBUILD moblock-0.8-r2.ebuild 2690 RMD160 dec9027ce8172ee0737b40294995d86772d611db SHA1 bac734b6c85acade358893431acd568e53a0fb29 SHA256 c90f3409aa7e8c8c12d7983deff0aaefaf1d8bf627ca7929c58d0a851b816e33
-MISC ChangeLog 5346 RMD160 f9ad4c5349c101e0bc43ebae60dc26c0ac25efe2 SHA1 0c0d3b51d006dda3dd9973fce06f1cde7a70ffa5 SHA256 06c50c1ac66fb7a6589e64c2a8ac6b509cd49a87308f6202bcca3d6a26b0eb6b
-MISC metadata.xml 438 RMD160 ba8f8160888e20ee14e19b1f03e850ea4f51d580 SHA1 cf9eb35e84f9c5897d3b5a60a2d6a8830128190f SHA256 ea8e7fbe5303388357b94705bc312740b012b5a058f881367066c5223d56936b
+EBUILD moblock-0.8-r2.ebuild 2450 RMD160 7981803bad9bc5d5fabe8ba0978bc1e6f6e367b1 SHA1 524e70a7f3673ea40a68534e0b42ca96ab510023 SHA256 5c736cf7b8f2df8265d4ee3fd6b4a06e1276077586b72120fd15855200e860ef
+MISC ChangeLog 5574 RMD160 8b54519364857dc87c32ef60e75aeda9c4b5276d SHA1 534642f2579653abe2cbbe14bde91e15cf898074 SHA256 be2883dbc81ebebb5072d93c82f478a4d3705fdaff4f0734c434c27f20969aa2
+MISC metadata.xml 360 RMD160 bc7f5b4fdb7e4dd74d2299e13c178f46247fdc7c SHA1 edcddf980c40e3dd7753dce6e25a22e09601bd2d SHA256 7b69e61394eeba5b0055492035945e864489cca783c10ee8a292f6bf1dd9a877
diff --git a/net-misc/moblock/metadata.xml b/net-misc/moblock/metadata.xml
index cc3b3f5a5..00c45447c 100644
--- a/net-misc/moblock/metadata.xml
+++ b/net-misc/moblock/metadata.xml
@@ -5,6 +5,5 @@
<use>
<flag name="logrotate">Use <pkg>app-admin/logrotate</pkg> to rotate log files</flag>
<flag name="network-cron">Adds monthly cronjob to update blocklist files</flag>
- <flag name="paranoid">Use paranoid blocklist file and update daily</flag>
</use>
</pkgmetadata>
diff --git a/net-misc/moblock/moblock-0.8-r2.ebuild b/net-misc/moblock/moblock-0.8-r2.ebuild
index 841a9e301..faf122604 100644
--- a/net-misc/moblock/moblock-0.8-r2.ebuild
+++ b/net-misc/moblock/moblock-0.8-r2.ebuild
@@ -13,12 +13,13 @@ SRC_URI="mirror://berlios/${PN}/${MY_P}-i586.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="logrotate network-cron paranoid"
+IUSE="logrotate network-cron"
DEPEND="net-libs/libnetfilter_queue
net-libs/libnfnetlink"
RDEPEND="${DEPEND}
- net-firewall/iptables"
+ net-firewall/iptables
+ logrotate? ( app-admin/logrotate )"
S=${WORKDIR}/${MY_P}
@@ -35,27 +36,17 @@ src_compile() {
}
src_install() {
- dosbin moblock || die
-
- dosbin "${FILESDIR}/${PVR}/moblock-{update,stats}" || die
+ dosbin "${FILESDIR}/${PVR}/"moblock-{update,stats} moblock || die
newinitd "${FILESDIR}/${PVR}/init.d" moblock || die
- doconfd "${FILESDIR}/${PVR}/moblock.{paranoid,normal,minimal}.example" || die
- if use paranoid; then
- newconfd "${FILESDIR}/${PVR}/moblock.paranoid.example" moblock || die
- else
- newconfd "${FILESDIR}/${PVR}/moblock.normal.example" moblock || die
- fi
+ doconfd "${FILESDIR}/${PVR}/"moblock.{paranoid,normal,minimal}.example || die
+ newconfd "${FILESDIR}/${PVR}/moblock.normal.example" moblock || die
dodir /var/{db,cache}/moblock || die
touch "${D}/var/db/moblock/guarding.p2p" || die
if use network-cron; then
- if use paranoid; then
- dosym /usr/sbin/moblock-update /etc/cron.daily/moblock-update || die
- else
- dosym /usr/sbin/moblock-update /etc/cron.weekly/moblock-update || die
- fi
+ dosym /usr/sbin/moblock-update /etc/cron.weekly/moblock-update || die
fi
if use logrotate; then
@@ -68,10 +59,9 @@ src_install() {
pkg_postinst() {
if use network-cron; then
- local cron_interval="$(use paranoid && echo daily || echo weekly)";
- elog "The script /usr/sbin/moblock-update will be run ${cron_interval} to update your"
+ elog "The script /usr/sbin/moblock-update will be run weekly to update your"
elog "blocklists. You can change this by moving or removing the symlink"
- elog "/etc/cron.${cron_interval}/moblock-update or re-installing MoBlock without the"
+ elog "/etc/cron.weekly/moblock-update or re-installing MoBlock without the"
elog "network-cron USE flag."
else
elog "Run moblock-update to update your block list. To have this happen"
@@ -79,7 +69,7 @@ pkg_postinst() {
fi
elog ""
elog "You can view or change your blocklist(s) and other options by editing"
- elog "/etc/conf.d/moblock."
+ elog "/etc/conf.d/moblock. Example configuration files are also in /etc/conf.d/."
}
pkg_postrm() {