Version bump to 0.13, bug #238177.

(Portage version: 2.2_rc11/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

4 files changed, 24 insertions, 44 deletions

diff --git a/dev-libs/libdaemon/ChangeLog b/dev-libs/libdaemon/ChangeLog
index 5f1651588058..59cccb105448 100644
--- a/dev-libs/libdaemon/ChangeLog
+++ b/dev-libs/libdaemon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libdaemon
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdaemon/ChangeLog,v 1.54 2008/05/18 21:16:18 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdaemon/ChangeLog,v 1.55 2008/10/02 21:13:05 eva Exp $
+
+*libdaemon-0.13 (02 Oct 2008)
+
+  02 Oct 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/libdaemon-0.11-daemon_close_all.patch, libdaemon-0.10.ebuild,
+  -libdaemon-0.11-r1.ebuild, +libdaemon-0.13.ebuild:
+  Version bump to 0.13, bug #238177.
 
   18 May 2008; Gilles Dartiguelongue <eva@gentoo.org> libdaemon-0.10.ebuild,
   libdaemon-0.11-r1.ebuild, libdaemon-0.12.ebuild:
diff --git a/dev-libs/libdaemon/files/libdaemon-0.11-daemon_close_all.patch b/dev-libs/libdaemon/files/libdaemon-0.11-daemon_close_all.patch
deleted file mode 100644
index 840eceec4a9f..000000000000
--- a/dev-libs/libdaemon/files/libdaemon-0.11-daemon_close_all.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ru libdaemon-0.11.orig/libdaemon/dfork.c libdaemon-0.11/libdaemon/dfork.c
---- libdaemon-0.11.orig/libdaemon/dfork.c	2007-06-11 11:36:11.000000000 -0400
-+++ libdaemon-0.11/libdaemon/dfork.c	2007-06-28 16:30:28.000000000 -0400
-@@ -357,6 +357,11 @@
-     int n, i, r;
-     int *p;
- 
-+    if (except_fd < 0) {
-+        int t = -1;
-+        return daemon_close_allv(&t);
-+    }
-+
-     va_start(original_ap, except_fd);
-     va_copy(ap, original_ap);
- 
-@@ -365,12 +370,13 @@
- 
-     va_end(ap);
- 
--    if (!(p = malloc(sizeof(int) * (n+1)))) {
-+    if (!(p = malloc(sizeof(int) * (n+2)))) {
-         va_end(original_ap);
-         return -1;
-     }
- 
--    i = 0;
-+    p[0] = except_fd;
-+    i = 1;
-     while ((p[i++] = va_arg(original_ap, int)) >= 0)
-         ;
- 
diff --git a/dev-libs/libdaemon/libdaemon-0.10.ebuild b/dev-libs/libdaemon/libdaemon-0.10.ebuild
index 1bdb625196fd..45a10051d930 100644
--- a/dev-libs/libdaemon/libdaemon-0.10.ebuild
+++ b/dev-libs/libdaemon/libdaemon-0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdaemon/libdaemon-0.10.ebuild,v 1.18 2008/05/18 21:16:18 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdaemon/libdaemon-0.10.ebuild,v 1.19 2008/10/02 21:13:05 eva Exp $
 
 DESCRIPTION="Simple library for creating daemon processes in C"
 HOMEPAGE="http://0pointer.de/lennart/projects/libdaemon/"
@@ -8,7 +8,7 @@ SRC_URI="http://0pointer.de/lennart/projects/libdaemon/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="arm s390 sh"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-libs/libdaemon/libdaemon-0.11-r1.ebuild b/dev-libs/libdaemon/libdaemon-0.13.ebuild
index 8148fdda3ac2..b7da4bc4a990 100644
--- a/dev-libs/libdaemon/libdaemon-0.11-r1.ebuild
+++ b/dev-libs/libdaemon/libdaemon-0.13.ebuild
@@ -1,29 +1,29 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdaemon/libdaemon-0.11-r1.ebuild,v 1.6 2008/05/18 21:16:18 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdaemon/libdaemon-0.13.ebuild,v 1.1 2008/10/02 21:13:05 eva Exp $
 
-inherit eutils
+inherit libtool
 
 DESCRIPTION="Simple library for creating daemon processes in C"
 HOMEPAGE="http://0pointer.de/lennart/projects/libdaemon/"
-SRC_URI="http://0pointer.de/lennart/projects/libdaemon/${P}.tar.gz"
+SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd"
-IUSE="doc"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc examples"
 
 RDEPEND=""
 DEPEND="doc? ( app-doc/doxygen )"
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-daemon_close_all.patch"
+
+	elibtoolize
 }
 
 src_compile() {
-	econf --disable-lynx || die "econf failed"
+	econf --disable-lynx
 	emake || die "emake failed"
 
 	if use doc ; then
@@ -33,7 +33,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 
 	if use doc; then
 		ln -sf doc/reference/html reference
@@ -41,6 +41,10 @@ src_install() {
 		doman doc/reference/man/man*/*
 	fi
 
+	if use examples; then
+		docinto examples
+		dodoc examples/testd.c
+	fi
+
 	dodoc README
-	docinto examples ; dodoc examples/testd.c
 }