Version bump; removed unzip dep as upstream now provides tarballs too.

Package-Manager: portage-2.0.51.16

7 files changed, 107 insertions, 56 deletions

diff --git a/dev-util/efence/ChangeLog b/dev-util/efence/ChangeLog
index 7e5f9df62577..67068e281b38 100644
--- a/dev-util/efence/ChangeLog
+++ b/dev-util/efence/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/efence
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/efence/ChangeLog,v 1.14 2005/01/20 22:39:39 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/efence/ChangeLog,v 1.15 2005/02/13 13:06:54 ka0ttic Exp $
+
+*efence-2.4.13 (13 Feb 2005)
+
+  13 Feb 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/efence-2.4.13-gentoo.diff, -efence-2.2.2.ebuild,
+  +efence-2.4.13.ebuild:
+  Version bump; removed unzip dep as upstream now provides tarballs too.
 
   20 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> efence-2.4.11.ebuild:
   Stable on sparc again, thanks to ka0ttic
diff --git a/dev-util/efence/Manifest b/dev-util/efence/Manifest
index bef5b56063bb..1a483450d93d 100644
--- a/dev-util/efence/Manifest
+++ b/dev-util/efence/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 471ca5683d46ba7c6195ad28c63a940a ChangeLog 1684
-MD5 a73608864d3d17e1fcca001047282e57 efence-2.2.2.ebuild 1275
-MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
 MD5 ade421c953a96c4ed89764eb6cfc15db efence-2.4.11.ebuild 972
-MD5 ce0876e5c833a87a5e77ea633ac53fcf files/digest-efence-2.2.2 70
+MD5 6efd141ff4bfac54cc51c02c284ebd5c efence-2.4.13.ebuild 971
+MD5 58aee3b84ff333630393534180235c4e ChangeLog 1919
+MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
 MD5 d35a3070c0dd4f13b768a8cf553240c7 files/digest-efence-2.4.11 62
+MD5 a8910bdef00c2a02596e36a53ffbf2d1 files/digest-efence-2.4.13 64
 MD5 e635e4f9c61c0ef39429b3da3647b3e2 files/efence-2.4.11-gentoo.diff 1733
+MD5 dc371b321f0dda8c1f90f2441e7512a9 files/efence-2.4.13-gentoo.diff 1623
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB8DMtKRy60XGEcJIRAg+QAJ93idXjPdfHxXarXjVZrQMudRp9gACfdVEX
-PXIC8AXPsPsdZXYAbpwg/v4=
-=w7Y0
+iD8DBQFCD1D2EZCkKN40op4RAqFAAKCg22LynecGN3mZWZlrNpx/8+Y6TACfVw8q
+WNZNA4Bwz1DgphevY3GtYOo=
+=j8e+
 -----END PGP SIGNATURE-----
diff --git a/dev-util/efence/efence-2.2.2.ebuild b/dev-util/efence/efence-2.2.2.ebuild
deleted file mode 100644
index edd815851d50..000000000000
--- a/dev-util/efence/efence-2.2.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/efence/efence-2.2.2.ebuild,v 1.16 2005/01/05 10:30:03 ka0ttic Exp $
-
-inherit gcc
-
-MY_P="ElectricFence-${PV}"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="old crusty malloc() debugger for Linux and Unix"
-HOMEPAGE="http://perens.com/FreeSoftware/"
-SRC_URI="ftp://ftp.perens.com/pub/ElectricFence/Beta/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	if ! emake CC="$(gcc-getCC)" ; then
-		if [ "`gcc-major-version`" == "3" ] ; then
-			eerror "gcc-3.x and efence is NOT SUPPORTED on Gentoo."
-			eerror "You should:"
-			eerror "   (1) use valgrind"
-			eerror "   (2) fix efence to work with gcc-3.x and send the fixes to us"
-			eerror ""
-			eerror "Do NOT file a bug about this package unless"
-			eerror "you have a patch to fix the problems."
-			die "efence sucks with gcc-3.x"
-		else
-			die "Could not compile"
-		fi
-	fi
-}
-
-src_install() {
-	dodir /usr/bin /usr/lib /usr/share/man/man3
-	make \
-		BIN_INSTALL_DIR="${D}/usr/bin" \
-		LIB_INSTALL_DIR="${D}/usr/lib" \
-		MAN_INSTALL_DIR="${D}/usr/share/man/man3" \
-		install \
-		|| die "make install failed"
-	dodoc CHANGES README
-}
diff --git a/dev-util/efence/efence-2.4.13.ebuild b/dev-util/efence/efence-2.4.13.ebuild
new file mode 100644
index 000000000000..0727415de77c
--- /dev/null
+++ b/dev-util/efence/efence-2.4.13.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/efence/efence-2.4.13.ebuild,v 1.1 2005/02/13 13:06:54 ka0ttic Exp $
+
+inherit eutils versionator toolchain-funcs
+
+MY_P="${PN}_$(replace_all_version_separators '_')"
+S="${WORKDIR}/${PN}"
+DESCRIPTION="ElectricFence malloc() debugger"
+HOMEPAGE="http://www.pf-lug.de/projekte/haya/efence.php"
+SRC_URI="http://www.pf-lug.de/projekte/haya/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~sparc"
+IUSE=""
+
+DEPEND="virtual/libc"
+RDEPEND="${DEPEND}
+	app-shells/bash"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) || die "emake failed"
+}
+
+src_install() {
+	make prefix="${D}/usr" install || die "make install failed"
+	insinto /usr/include
+	doins efence.h efencepp.h efence_config.h \
+		|| die "failed to install headers"
+	dodoc CHANGES README
+}
diff --git a/dev-util/efence/files/digest-efence-2.2.2 b/dev-util/efence/files/digest-efence-2.2.2
deleted file mode 100644
index 06cdbed037ec..000000000000
--- a/dev-util/efence/files/digest-efence-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 56a3cbfdbf65f916988787c789c63e80 ElectricFence-2.2.2.tar.gz 28247
diff --git a/dev-util/efence/files/digest-efence-2.4.13 b/dev-util/efence/files/digest-efence-2.4.13
new file mode 100644
index 000000000000..d6b1076dbc2d
--- /dev/null
+++ b/dev-util/efence/files/digest-efence-2.4.13
@@ -0,0 +1 @@
+MD5 0b35c601c962e2818f7afa1892167bb5 efence_2_4_13.tar.gz 60243
diff --git a/dev-util/efence/files/efence-2.4.13-gentoo.diff b/dev-util/efence/files/efence-2.4.13-gentoo.diff
new file mode 100644
index 000000000000..4cf230f2acc3
--- /dev/null
+++ b/dev-util/efence/files/efence-2.4.13-gentoo.diff
@@ -0,0 +1,51 @@
+diff --exclude='*~' -urN efence.orig/Makefile efence/Makefile
+--- efence.orig/Makefile	2005-02-13 07:58:10.983741525 -0500
++++ efence/Makefile	2005-02-13 08:01:31.238275782 -0500
+@@ -27,8 +27,8 @@
+   endif
+ else
+   CURPATH=./
+-  CFLAGS= -g $(PIC) $(EF_OPTIONS)
+-  CPPFLAGS= -g $(PIC) $(EF_OPTIONS)
++  CFLAGS+= -g $(PIC) $(EF_OPTIONS)
++#   CPPFLAGS= -g $(PIC) $(EF_OPTIONS)
+   LIBS=-lpthread
+   EFENCESO=libefence.so.0.0
+ endif
+@@ -53,7 +53,9 @@
+ 
+ OBJECTS = efencepp.o efence.o
+ 
+-all:	libefence.a $(EFENCESO) tstheap eftest eftestpp
++all:	libefence.a $(EFENCESO)
++
++check: tstheap eftest eftestpp
+ 	@ echo "Testing Electric Fence."
+ 	@ echo "After the last test, it should print that the test has PASSED."
+ 	$(CURPATH)eftest
+@@ -61,13 +63,16 @@
+ 	@ echo "Electric Fence confidence test PASSED."
+ 
+ install: libefence.a efence.3 libefence.so.0.0
++	$(INSTALL) -d $(BIN_INSTALL_DIR)
+ 	$(INSTALL) -m 755 ef.sh $(BIN_INSTALL_DIR)/ef
++	$(INSTALL) -d $(LIB_INSTALL_DIR)
+ 	$(INSTALL) -m 644 libefence.a $(LIB_INSTALL_DIR)
+ 	$(INSTALL) -m 755 libefence.so.0.0 $(LIB_INSTALL_DIR)
+ 	- rm -f $(LIB_INSTALL_DIR)/libefence.so.0
+ 	ln -s libefence.so.0.0 $(LIB_INSTALL_DIR)/libefence.so.0
+ 	- rm -f $(LIB_INSTALL_DIR)/libefence.so
+ 	ln -s libefence.so.0.0 $(LIB_INSTALL_DIR)/libefence.so
++	$(INSTALL) -d $(MAN_INSTALL_DIR)
+ 	$(INSTALL) -m 644 efence.3 $(MAN_INSTALL_DIR)/efence.3
+ 
+ clean:
+@@ -93,7 +98,7 @@
+ ifneq ($(OS), Windows_NT)
+ libefence.so.0.0: efence_config.h $(OBJECTS)
+ 	$(CXX) -g -shared -Wl,-soname,libefence.so.0 -o libefence.so.0.0 \
+-	$(OBJECTS) -lpthread -lc
++	$(OBJECTS) -lpthread
+ endif
+ 
+ efence_config.h: createconf