Remove old.

(Portage version: 2.2_rc91/cvs/Linux x86_64)

6 files changed, 7 insertions, 140 deletions

diff --git a/dev-java/commons-daemon/ChangeLog b/dev-java/commons-daemon/ChangeLog
index 1acdf39a92b6..f7d36d981a9c 100644
--- a/dev-java/commons-daemon/ChangeLog
+++ b/dev-java/commons-daemon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-daemon
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/ChangeLog,v 1.39 2010/10/14 16:55:17 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/ChangeLog,v 1.40 2010/10/17 12:25:14 caster Exp $
+
+  17 Oct 2010; Vlastimil Babka <caster@gentoo.org>
+  -files/1.0.1-as-needed.patch, -commons-daemon-1.0.1-r2.ebuild,
+  -files/1.0.1-capabilities-non-root.patch, -files/1.0.1-execve-self.patch,
+  -files/1.0.1-fbsd.patch:
+  Remove old.
 
   14 Oct 2010; Brent Baude <ranger@gentoo.org> commons-daemon-1.0.2.ebuild:
   stable ppc, bug 316297
diff --git a/dev-java/commons-daemon/commons-daemon-1.0.1-r2.ebuild b/dev-java/commons-daemon/commons-daemon-1.0.1-r2.ebuild
deleted file mode 100644
index a132895a95f7..000000000000
--- a/dev-java/commons-daemon/commons-daemon-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/commons-daemon-1.0.1-r2.ebuild,v 1.5 2007/11/25 12:06:34 nelchael Exp $
-
-WANT_AUTOCONF=2.5
-inherit java-pkg-2 java-ant-2 eutils autotools
-
-DESCRIPTION="Tools to allow java programs to run as unix daemons"
-SRC_URI="mirror://apache/jakarta/commons/daemon/source/daemon-${PV}.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/commons/daemon/"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="doc examples source"
-
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.4"
-
-S=${WORKDIR}/daemon-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Submitted upstream to http://bugs.gentoo.org/show_bug.cgi?id=132563
-	epatch "${FILESDIR}/1.0.1-as-needed.patch"
-
-	# Fix fbsd building, from upstream svn, #157381
-	epatch "${FILESDIR}/1.0.1-fbsd.patch"
-
-	# https://issues.apache.org/jira/browse/DAEMON-93
-	epatch "${FILESDIR}/1.0.1-capabilities-non-root.patch"
-
-	# Already in trunk
-	epatch "${FILESDIR}/1.0.1-execve-self.patch"
-
-	cd "${S}/src/native/unix"
-	sed -e "s/powerpc/powerpc|powerpc64/g" -i support/apsupport.m4
-	eautoconf
-}
-
-src_compile() {
-	# compile native stuff
-	cd "${S}/src/native/unix"
-	econf || die "configure failed"
-	emake || die "make failed"
-
-	# compile java stuff
-	cd "${S}"
-	eant jar $(use_doc)
-}
-
-src_install() {
-	dobin src/native/unix/jsvc
-	java-pkg_dojar dist/${PN}.jar
-
-	dodoc README RELEASE-NOTES.txt *.html
-	use doc && java-pkg_dohtml -r dist/docs/*
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples
-		cp -R src/samples/* "${D}/usr/share/doc/${PF}/examples"
-	fi
-	use source && java-pkg_dosrc src/java/* src/native/unix/native
-}
diff --git a/dev-java/commons-daemon/files/1.0.1-as-needed.patch b/dev-java/commons-daemon/files/1.0.1-as-needed.patch
deleted file mode 100644
index 3f2bc5f1ac40..000000000000
--- a/dev-java/commons-daemon/files/1.0.1-as-needed.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- daemon-1.0.1/src/native/unix/support/apsupport.m4.orig	2006-05-07 15:28:22.000000000 +0200
-+++ daemon-1.0.1/src/native/unix/support/apsupport.m4	2006-05-07 15:34:42.000000000 +0200
-@@ -35,7 +35,7 @@
-   linux*)
-     CFLAGS="$CFLAGS -DOS_LINUX -DDSO_DLFCN"
-     supported_os="linux"
--    LDFLAGS="$LDFLAGS -ldl -lpthread"
-+    LIBS="$LIBS -ldl -lpthread"
-     ;;
-   cygwin)
-     CFLAGS="$CFLAGS -DOS_CYGWIN -DDSO_DLFCN -DNO_SETSID"
-@@ -94,4 +94,5 @@
-   AC_MSG_RESULT([ok])
-   AC_SUBST(CFLAGS)
-   AC_SUBST(LDFLAGS)
-+  AC_SUBST(LIBS)
- ])
---- daemon-1.0.1/src/native/unix/Makedefs.in.orig	2006-05-07 15:50:07.000000000 +0200
-+++ daemon-1.0.1/src/native/unix/Makedefs.in	2004-02-27 09:40:46.000000000 +0100
-@@ -22,6 +22,7 @@
- JAR = @JAR@
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
-+LIBS = @LIBS@
- JAVACFLAGS = @JAVACFLAGS@
- RANLIB = @RANLIB@
- LDCMD = @LDCMD@
---- daemon-1.0.1/src/native/unix/native/Makefile.in.orig	2006-05-07 15:36:54.000000000 +0200
-+++ daemon-1.0.1/src/native/unix/native/Makefile.in	2006-05-07 15:37:44.000000000 +0200
-@@ -36,7 +36,7 @@
- 	$(RANLIB) libservice.a
- 
- jsvc: jsvc-unix.o libservice.a
--	$(LDCMD) $(LDFLAGS) jsvc-unix.o libservice.a -o ../jsvc
-+	$(LDCMD) $(LDFLAGS) jsvc-unix.o libservice.a $(LIBS) -o ../jsvc
- 
- clean:
- 	rm -f $(OBJS) ../jsvc jsvc-unix.o libservice.a
diff --git a/dev-java/commons-daemon/files/1.0.1-capabilities-non-root.patch b/dev-java/commons-daemon/files/1.0.1-capabilities-non-root.patch
deleted file mode 100644
index 5a9566b91676..000000000000
--- a/dev-java/commons-daemon/files/1.0.1-capabilities-non-root.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- daemon-1.0.1/src/native/unix/native/jsvc-unix.c.orig	2007-01-20 12:08:52.000000000 +0100
-+++ daemon-1.0.1/src/native/unix/native/jsvc-unix.c	2007-01-20 12:12:35.000000000 +0100
-@@ -475,7 +475,7 @@
- 
- #ifdef OS_LINUX
-     /* setuid()/setgid() only apply the current thread so we must do it now */
--    if (linuxset_user_group(args->user,uid,gid)!=0)
-+    if (getuid()==0 && linuxset_user_group(args->user,uid,gid)!=0)
-             return(4);
- #endif
-     /* Initialize the Java VM */
diff --git a/dev-java/commons-daemon/files/1.0.1-execve-self.patch b/dev-java/commons-daemon/files/1.0.1-execve-self.patch
deleted file mode 100644
index 578d2e021e8f..000000000000
--- a/dev-java/commons-daemon/files/1.0.1-execve-self.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- daemon-1.0.1/src/native/unix/native/jsvc-unix.c.orig	2007-01-20 12:08:52.000000000 +0100
-+++ daemon-1.0.1/src/native/unix/native/jsvc-unix.c	2007-01-20 13:15:43.000000000 +0100
-@@ -652,6 +652,7 @@
-         log_debug("Invoking w/ LD_LIBRARY_PATH=%s",getenv("LD_LIBRARY_PATH"));
- 
-         argv[0]=args->procname;
-+        execve("/proc/self/exe",argv,environ);
-         execve(old,argv,environ);
-         log_error("Cannot execute JSVC executor process");
-         return(1);
diff --git a/dev-java/commons-daemon/files/1.0.1-fbsd.patch b/dev-java/commons-daemon/files/1.0.1-fbsd.patch
deleted file mode 100644
index b7851899752d..000000000000
--- a/dev-java/commons-daemon/files/1.0.1-fbsd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: daemon-1.0.1/src/native/unix/support/apsupport.m4
-===================================================================
---- daemon-1.0.1.orig/src/native/unix/support/apsupport.m4
-+++ daemon-1.0.1/src/native/unix/support/apsupport.m4
-@@ -49,7 +49,7 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
-     CFLAGS="$CFLAGS -DOS_SYSV -DDSO_DLFCN -Kthread"
-     LDFLAGS="-Kthread $LDFLAGS -ldl"
-     ;;
--  freebsd4.?)
-+  freebsd*)
-     CFLAGS="$CFLAGS -DOS_FREEBSD -DDSO_DLFCN -D_THREAD_SAFE -pthread"
-     LDFLAGS="-pthread $LDFLAGS"
-     supported_os="freebsd"