Version bump; efence is alive again (and works with gcc-3). Updated metadata.xml.

7 files changed, 130 insertions, 8 deletions

diff --git a/dev-util/efence/ChangeLog b/dev-util/efence/ChangeLog
index 42e21ff7748a..0217c094993c 100644
--- a/dev-util/efence/ChangeLog
+++ b/dev-util/efence/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/efence
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/efence/ChangeLog,v 1.8 2004/07/14 22:10:14 agriffis Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/efence/ChangeLog,v 1.9 2005/01/05 10:30:03 ka0ttic Exp $
+
+*efence-2.4.11 (05 Jan 2005)
+
+  05 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> metadata.xml,
+  +files/efence-2.4.11-gentoo.diff, +efence-2.4.11.ebuild:
+  Version bump; efence is alive again (and works with gcc-3). Updated
+  metadata.xml.
 
   10 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> efence-2.2.2.ebuild:
   error messages; IUSE; doc tidy
diff --git a/dev-util/efence/Manifest b/dev-util/efence/Manifest
index 87b1c2c2f0d5..9f31095fc56b 100644
--- a/dev-util/efence/Manifest
+++ b/dev-util/efence/Manifest
@@ -1,4 +1,17 @@
-MD5 308963aef63458018fbfc2c90333eac4 efence-2.2.2.ebuild 1274
-MD5 2f039f27bdf37040bf36425b0669b583 ChangeLog 856
-MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2915b8f8eed62e724355e50c473dcd48 efence-2.4.11.ebuild 950
+MD5 a73608864d3d17e1fcca001047282e57 efence-2.2.2.ebuild 1275
+MD5 9431ce868bd40a2228a1dcdbaaa04255 ChangeLog 1094
+MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
+MD5 d35a3070c0dd4f13b768a8cf553240c7 files/digest-efence-2.4.11 62
+MD5 e635e4f9c61c0ef39429b3da3647b3e2 files/efence-2.4.11-gentoo.diff 1733
 MD5 ce0876e5c833a87a5e77ea633ac53fcf files/digest-efence-2.2.2 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB28GzEZCkKN40op4RAsxFAJ9B4pnYS88C8J2CVCiOmCjowqy4BQCfT/Np
+inLDDIeU8EF1yt1L6BP9ieE=
+=tfd2
+-----END PGP SIGNATURE-----
diff --git a/dev-util/efence/efence-2.2.2.ebuild b/dev-util/efence/efence-2.2.2.ebuild
index 048267646e16..edd815851d50 100644
--- a/dev-util/efence/efence-2.2.2.ebuild
+++ b/dev-util/efence/efence-2.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.15 2004/06/25 22:44:52 vapier Exp $
+# $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
 
diff --git a/dev-util/efence/efence-2.4.11.ebuild b/dev-util/efence/efence-2.4.11.ebuild
new file mode 100644
index 000000000000..88afcf67afb4
--- /dev/null
+++ b/dev-util/efence/efence-2.4.11.ebuild
@@ -0,0 +1,37 @@
+# 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.11.ebuild,v 1.1 2005/01/05 10:30:03 ka0ttic Exp $
+
+inherit 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}.zip"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~sparc"
+IUSE=""
+
+DEPEND="virtual/libc"
+RDEPEND="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.4.11 b/dev-util/efence/files/digest-efence-2.4.11
new file mode 100644
index 000000000000..1a0aa9be95e4
--- /dev/null
+++ b/dev-util/efence/files/digest-efence-2.4.11
@@ -0,0 +1 @@
+MD5 54888bd8ff92a459a385d7fbb9a21e6b efence_2_4_11.zip 100544
diff --git a/dev-util/efence/files/efence-2.4.11-gentoo.diff b/dev-util/efence/files/efence-2.4.11-gentoo.diff
new file mode 100644
index 000000000000..5939a9f19482
--- /dev/null
+++ b/dev-util/efence/files/efence-2.4.11-gentoo.diff
@@ -0,0 +1,60 @@
+diff -urN efence.orig/Makefile efence/Makefile
+--- efence.orig/Makefile	2005-01-04 22:02:25.000000000 -0500
++++ efence/Makefile	2005-01-04 22:53:39.776708008 -0500
+@@ -10,8 +10,8 @@
+     EFENCESO=
+   endif
+ else
+-  CFLAGS= -g $(PIC)
+-  CPPFLAGS= -g $(PIC)
++  CFLAGS += -g $(PIC)
++#   CPPFLAGS += $(PIC)
+   LIBS=-lpthread
+   EFENCESO=libefence.so.0.0
+ endif
+@@ -25,7 +25,7 @@
+ prefix=/usr
+ BIN_INSTALL_DIR= $(prefix)/bin
+ LIB_INSTALL_DIR= $(prefix)/lib
+-MAN_INSTALL_DIR= $(prefix)/man/man3
++MAN_INSTALL_DIR= $(prefix)/share/man/man3
+ 
+ 
+ PACKAGE_SOURCE= README CHANGES efence.3 Makefile \
+@@ -36,7 +36,9 @@
+ 
+ OBJECTS = efencepp.o efence.o
+ 
+-all:	libefence.a $(EFENCESO) tstheap eftest eftestpp
++all:	libefence.a $(EFENCESO)
++
++check: tstheap eftest eftestpp
+ 	@ echo
+ 	@ echo "Testing Electric Fence."
+ 	@ echo "After the last test, it should print that the test has PASSED."
+@@ -47,13 +49,16 @@
+ 	@ echo
+ 
+ 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:
+@@ -79,7 +84,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
diff --git a/dev-util/efence/metadata.xml b/dev-util/efence/metadata.xml
index fb4199eb7afe..d31152aca840 100644
--- a/dev-util/efence/metadata.xml
+++ b/dev-util/efence/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>ka0ttic@gentoo.org</email>
+		<name>Aaron Walker</name>
+	</maintainer>
 </pkgmetadata>