Removed useless postinst message, bug #221031 reported by Denilson. Removed old ebuild.

Package-Manager: portage-2.1.4.4

6 files changed, 13 insertions, 141 deletions

diff --git a/net-firewall/ebtables/ChangeLog b/net-firewall/ebtables/ChangeLog
index 445d31493ec2..b30db41fdf52 100644
--- a/net-firewall/ebtables/ChangeLog
+++ b/net-firewall/ebtables/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/ebtables
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.22 2007/11/02 21:44:46 pylon Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.23 2008/05/11 11:04:49 pva Exp $
+
+  11 May 2008; Peter Volkov <pva@gentoo.org>
+  -files/ebtables-2.0.8.1-fix-textrel.patch,
+  -files/ebtables-2.0.8.1-scripts-build.patch, -ebtables-2.0.8.1.ebuild,
+  ebtables-2.0.8.2.ebuild:
+  Removed useless postinst message, bug #221031 reported by Denilson.
+  Removed old ebuild.
 
   02 Nov 2007; Lars Weiler <pylon@gentoo.org> ebtables-2.0.8.2.ebuild:
   stable ppc, bug #197750
diff --git a/net-firewall/ebtables/Manifest b/net-firewall/ebtables/Manifest
index 727175791421..4a55d1fb36ef 100644
--- a/net-firewall/ebtables/Manifest
+++ b/net-firewall/ebtables/Manifest
@@ -1,11 +1,7 @@
 AUX ebtables-2.0.8.1-ebt-save.diff 1089 RMD160 d36bd4ee1f9c5640d960e0b537829faade9251c4 SHA1 efad4c40e92b42d59e044c78945aed00ef756ed8 SHA256 b4d7022a616152ca439d2b09f14fda8a3ef479b823c2da44eb0e9e22b256be90
-AUX ebtables-2.0.8.1-fix-textrel.patch 521 RMD160 7beb8cb14452ea33f622337d52dc9be354fb6c33 SHA1 f583e95e28c826d70ded4f96192e49205cab33ea SHA256 5fb4884ea95b5bc03a358eba8500a6c8b3c52b99ebc04e819f6ad925472d6b52
-AUX ebtables-2.0.8.1-scripts-build.patch 2628 RMD160 2d24b35c57231d06856bf6306b642cc8bd1ba298 SHA1 606ac72011dd6d3668706df0adade102e776d9ef SHA256 1d915fd72a90af6763009f801c7c4ef42a1deb82cd516cc09dc888b1de3f0916
 AUX ebtables.confd 466 RMD160 84f7bea9b78ae9fab08cc446c1cd64e74fe4e4f9 SHA1 2bf5e4db2fde07a9791c43cb27575aefe30cc895 SHA256 fa8dedd95f1a6834022e409754e1e41219a7671a1bbb99b2094356239135730d
 AUX ebtables.initd 2078 RMD160 da8ca12a06bf4134436b8c858b022935b95f7ab4 SHA1 d8d3628cbdc251d22558fc5761be95d012586f7f SHA256 14d443045dc1f9a3da84a4dc07040ac8a6d6042a2d87305b9eeca8495703cb53
-DIST ebtables-v2.0.8-1.tar.gz 96681 RMD160 0ff0f5aeaa418157b0e791dfbe93450ef323da51 SHA1 c70f012f274bfc277ee51f98fcffe0bfbbd36725 SHA256 e33edf08d5ae7974d3575f62468a981cc42afb1164bde3f0402e08fcfc404f74
 DIST ebtables-v2.0.8-2.tar.gz 97065 RMD160 b53fca7e2f34dd23ecb11af3804fa10c1702e815 SHA1 3e9331a55e02f0930047b7198501f380ebf6c2d9 SHA256 dd78c0dfa0dbeb128952dec9e916be948bf561dcb8ba3149ea7ce0166a2caf9b
-EBUILD ebtables-2.0.8.1.ebuild 1404 RMD160 29da7f6ec874a262ba0b4438e80f8ab291c95f69 SHA1 5891699d67fe5d8948067796a8444d39757132cd SHA256 13238c274e8ef397c07c9e16230530f62575588f4ecd059705b5ca0a3a0d905c
-EBUILD ebtables-2.0.8.2.ebuild 1545 RMD160 b2d1cfd8083296015e536dc6785cbc531ce4c489 SHA1 5b5b5a6cfaa7a3e72ef2dadc609526d15f412b7b SHA256 0be39f22aebb33bde3694ce1b95190d72bd626ef094b054bd50ef2467937a749
-MISC ChangeLog 3615 RMD160 66265c922d3f66fbf41d9d1e85176b3d2361f264 SHA1 c2d3e1ff0990ee96aaa3c8468502af5eb983c4b2 SHA256 01bce24330a654682f143e6e33b9153de146c79e116bbc16781502973566871f
+EBUILD ebtables-2.0.8.2.ebuild 1340 RMD160 7c32a3d06192af8134f7833de8163ac917dfd414 SHA1 ba925b114ce41b26321b9a1b7a0853c786ceb8ab SHA256 54dbad60050fefc9e1c3a22aebdc4bbd52d3cb079dd8986381b534d6984790d9
+MISC ChangeLog 3896 RMD160 38dc93023130f59e13ffe445a5da051d1e61bfcf SHA1 a9a8bba41af8e9f378069f56659b2c49b6fc7807 SHA256 55dcdab6011aaa17517b557b08dd1d5eaa120881d5ed4ae9743f93937ae19dc0
 MISC metadata.xml 251 RMD160 2acabb95dba06572ab5dfd2a6d7bca5ab53d7a64 SHA1 6bf96c40f48fb4f92026dd80b7b3e1ce7ebdc9d1 SHA256 8d646b2f01acd31f9bc065850081adfa7f1dfabd8e305e05331fc6d21cbbd504
diff --git a/net-firewall/ebtables/ebtables-2.0.8.1.ebuild b/net-firewall/ebtables/ebtables-2.0.8.1.ebuild
deleted file mode 100644
index af829fd82c8a..000000000000
--- a/net-firewall/ebtables/ebtables-2.0.8.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.8.1.ebuild,v 1.4 2007/09/10 19:20:49 maekke Exp $
-
-inherit versionator eutils toolchain-funcs multilib
-
-MY_PV=$(replace_version_separator 3 '-' )
-MY_P="${PN}-v${MY_PV}"
-
-DESCRIPTION="Utility that enables basic Ethernet frame filtering on a Linux bridge, MAC NAT and brouting."
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-HOMEPAGE="http://ebtables.sourceforge.net/"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Kill two rabits: TEXTREL and compilation on amd64. bug #159371.
-	epatch "${FILESDIR}"/${P}-fix-textrel.patch
-
-	# Fix scripts to be built during make, thus paths inside are correct.
-	epatch "${FILESDIR}"/${P}-scripts-build.patch
-
-	sed -i -e "s,MANDIR:=/usr/local/man,MANDIR:=/usr/share/man," \
-		-e "s,BINDIR:=/usr/local/sbin,BINDIR:=/sbin," \
-		-e "s,INITDIR:=/etc/rc.d/init.d,INITDIR:=/usr/share/doc/${PF}," \
-		-e "s,SYSCONFIGDIR:=/etc/sysconfig,SYSCONFIGDIR:=/usr/share/doc/${PF}," \
-		-e "s,LIBDIR:=/usr/lib,LIBDIR:=/$(get_libdir)/\$(PROGNAME)," Makefile
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	dodoc ChangeLog THANKS
-	make DESTDIR="${D}" install || die
-}
diff --git a/net-firewall/ebtables/ebtables-2.0.8.2.ebuild b/net-firewall/ebtables/ebtables-2.0.8.2.ebuild
index 192b6af641a7..c7b60ad7709c 100644
--- a/net-firewall/ebtables/ebtables-2.0.8.2.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.8.2.ebuild,v 1.4 2007/11/02 21:44:46 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.8.2.ebuild,v 1.5 2008/05/11 11:04:49 pva Exp $
 
 inherit versionator eutils toolchain-funcs multilib
 
@@ -43,11 +43,3 @@ src_install() {
 	newinitd "${FILESDIR}"/ebtables.initd ebtables
 	newconfd "${FILESDIR}"/ebtables.confd ebtables
 }
-
-pkg_postinst() {
-	echo
-	einfo "If you are interested in gentoo init script for ebtables, please,"
-	einfo "read the following file:"
-	einfo "/usr/share/doc/${PF}/init-scripts/README.gentoo.init"
-	echo
-}
diff --git a/net-firewall/ebtables/files/ebtables-2.0.8.1-fix-textrel.patch b/net-firewall/ebtables/files/ebtables-2.0.8.1-fix-textrel.patch
deleted file mode 100644
index 97a5497cabf2..000000000000
--- a/net-firewall/ebtables/files/ebtables-2.0.8.1-fix-textrel.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Makefile.orig	2007-08-12 13:02:55.000000000 +0400
-+++ ./Makefile	2007-08-12 13:03:04.000000000 +0400
-@@ -87,7 +87,7 @@
- 	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(PROGSPECS) -c -o $@ $< -Iinclude/
- 
- ebtables.o: ebtables.c include/ebtables_u.h
--	$(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $< -I$(KERNEL_INCLUDES)
-+	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(PROGSPECS) -c -o $@ $< -I$(KERNEL_INCLUDES)
- 
- ebtables-standalone.o: ebtables-standalone.c include/ebtables_u.h
- 	$(CC) $(CFLAGS) $(PROGSPECS) -c $< -o $@ -I$(KERNEL_INCLUDES)
diff --git a/net-firewall/ebtables/files/ebtables-2.0.8.1-scripts-build.patch b/net-firewall/ebtables/files/ebtables-2.0.8.1-scripts-build.patch
deleted file mode 100644
index 798eefda4290..000000000000
--- a/net-firewall/ebtables/files/ebtables-2.0.8.1-scripts-build.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- ./Makefile.orig	2007-08-12 13:25:23.000000000 +0400
-+++ ./Makefile	2007-08-12 13:36:13.000000000 +0400
-@@ -15,15 +15,6 @@
- SYSCONFIGDIR:=/usr/share/doc/ebtables-2.0.8.1
- DESTDIR:=
- 
--# include DESTDIR param
--override LIBDIR:=$(DESTDIR)$(LIBDIR)/$(PROGNAME)
--override MANDIR:=$(DESTDIR)$(MANDIR)
--override BINDIR:=$(DESTDIR)$(BINDIR)
--override ETCDIR:=$(DESTDIR)$(ETCDIR)
--override INITDIR:=$(DESTDIR)$(INITDIR)
--override SYSCONFIGDIR:=$(DESTDIR)$(SYSCONFIGDIR)
--
--
- CFLAGS:=-Wall -Wunused
- CFLAGS_SH_LIB:=-fPIC
- CC:=gcc
-@@ -163,34 +154,34 @@
- .PHONY: scripts
- scripts: ebtables-save ebtables.sysv ebtables-config
- 	cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_
--	install -m 0755 -o root -g root ebtables-save_ $(BINDIR)/ebtables-save
-+	install -m 0755 -o root -g root ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save
- 	cat ebtables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables.sysv_
--	install -m 0755 -o root -g root ebtables.sysv_ $(INITDIR)/ebtables
-+	install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables
- 	cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_
--	install -m 0600 -o root -g root ebtables-config_ $(SYSCONFIGDIR)/ebtables-config
-+	install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config
- 	rm -f ebtables-save_ ebtables.sysv_ ebtables-config_
- 
- $(MANDIR)/man8/ebtables.8: ebtables.8
--	mkdir -p $(@D)
-+	mkdir -p $(DESTDIR)$(@D)
- 	sed 's/$$(VERSION)/$(PROGVERSION)/' ebtables.8 | sed 's/$$(DATE)/$(PROGDATE)/' > ebtables.8_
--	install -m 0644 -o root -g root ebtables.8_ $@
-+	install -m 0644 -o root -g root ebtables.8_ $(DESTDIR)$@
- 	rm -f ebtables.8_
- 
- $(ETHERTYPESFILE): ethertypes
--	mkdir -p $(@D)
--	install -m 0644 -o root -g root $< $@
-+	mkdir -p $(DESTDIR)$(@D)
-+	install -m 0644 -o root -g root $< $(DESTDIR)$@
- 
- .PHONY: exec
- exec: ebtables ebtables-restore
--	mkdir -p $(BINDIR)
--	install -m 0755 -o root -g root $(PROGNAME) $(BINDIR)/$(PROGNAME)
--	install -m 0755 -o root -g root ebtables-restore $(BINDIR)/ebtables-restore
-+	mkdir -p $(DESTDIR)$(BINDIR)
-+	install -m 0755 -o root -g root $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
-+	install -m 0755 -o root -g root ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
- 
- .PHONY: install
- install: $(MANDIR)/man8/ebtables.8 $(ETHERTYPESFILE) exec scripts
--	mkdir -p $(LIBDIR)
--	install -m 0755 extensions/*.so $(LIBDIR)
--	install -m 0755 *.so $(LIBDIR)
-+	mkdir -p $(DESTDIR)$(LIBDIR)
-+	install -m 0755 extensions/*.so $(DESTDIR)$(LIBDIR)
-+	install -m 0755 *.so $(DESTDIR)$(LIBDIR)
- 
- .PHONY: clean
- clean: