Version bump wrt #299825. Fix -Wl,--as-needed issues wrt #247088 and #298152.

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

7 files changed, 177 insertions, 138 deletions

diff --git a/dev-libs/dvutil/ChangeLog b/dev-libs/dvutil/ChangeLog
index be5c63cb1c4d..5c5ef3900a0a 100644
--- a/dev-libs/dvutil/ChangeLog
+++ b/dev-libs/dvutil/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/dvutil
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvutil/ChangeLog,v 1.36 2010/03/06 20:44:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvutil/ChangeLog,v 1.37 2010/03/06 21:45:51 ssuominen Exp $
+
+*dvutil-1.0.10 (06 Mar 2010)
+
+  06 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +dvutil-1.0.10.ebuild, +files/dvutil-1.0.10-asneeded.patch:
+  Version bump wrt #299825. Fix -Wl,--as-needed issues wrt #247088 and
+  #298152.
 
   06 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> dvutil-1.0.5.ebuild,
   +files/dvutil-1.0.5-gcc44.patch:
diff --git a/dev-libs/dvutil/dvutil-0.15.5.ebuild b/dev-libs/dvutil/dvutil-0.15.5.ebuild
deleted file mode 100644
index 628c94139218..000000000000
--- a/dev-libs/dvutil/dvutil-0.15.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvutil/dvutil-0.15.5.ebuild,v 1.9 2009/10/04 14:47:56 ssuominen Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Provides some general C++ utility classes for files, directories, dates, property lists, reference counted pointers, number conversion etc. "
-HOMEPAGE="http://tinf2.vub.ac.be/~dvermeir/software/dv/dvutil/html/"
-SRC_URI="http://tinf2.vub.ac.be/~dvermeir/software/dv/${PN}/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="doc ssl"
-
-DEPEND="ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i 's|^\(SUBDIRS =.*\)doc\(.*\)$|\1\2|' Makefile.in || \
-		die "sed Makefile.in failed"
-
-	epatch "${FILESDIR}/${P}-missing_includes.patch"
-}
-
-src_compile() {
-	if ! use ssl ; then
-		sed -i -e 's/"ssl"//' configure || die "sed failed"
-	fi
-
-	# Bug #247088
-	append-ldflags $(no-as-needed)
-
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-
-	if use doc ; then
-		doman doc/man/*/*.[1-9]
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/dev-libs/dvutil/dvutil-1.0.10.ebuild b/dev-libs/dvutil/dvutil-1.0.10.ebuild
new file mode 100644
index 000000000000..323a27466613
--- /dev/null
+++ b/dev-libs/dvutil/dvutil-1.0.10.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvutil/dvutil-1.0.10.ebuild,v 1.1 2010/03/06 21:45:51 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="Provides some general C++ utility classes for files, directories, dates, property lists, reference counted pointers, number conversion etc. "
+HOMEPAGE="http://tinf2.vub.ac.be/~dvermeir/software/dv/dvutil/html/"
+SRC_URI="http://tinf2.vub.ac.be/~dvermeir/software/dv/${PN}/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc ssl"
+
+RDEPEND="ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ssl)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README
+
+	if use doc; then
+		dohtml -r doc/html/*
+	fi
+}
diff --git a/dev-libs/dvutil/dvutil-1.0.5.ebuild b/dev-libs/dvutil/dvutil-1.0.5.ebuild
deleted file mode 100644
index 22527ae3618f..000000000000
--- a/dev-libs/dvutil/dvutil-1.0.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvutil/dvutil-1.0.5.ebuild,v 1.3 2010/03/06 20:44:27 ssuominen Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Provides some general C++ utility classes for files, directories, dates, property lists, reference counted pointers, number conversion etc. "
-HOMEPAGE="http://tinf2.vub.ac.be/~dvermeir/software/dv/dvutil/html/"
-SRC_URI="http://tinf2.vub.ac.be/~dvermeir/software/dv/${PN}/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="doc ssl"
-
-DEPEND="ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-	sed -i 's|^\(SUBDIRS =.*\)doc\(.*\)$|\1\2|' Makefile.in || \
-		die "sed Makefile.in failed"
-}
-
-src_compile() {
-	if ! use ssl ; then
-		sed -i -e 's/"ssl"//' configure || die "sed failed"
-	fi
-
-	# Bug #247088
-	append-ldflags $(no-as-needed)
-
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-
-	if use doc ; then
-		doman doc/man/*/*.[1-9]
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/dev-libs/dvutil/files/dvutil-0.15.5-missing_includes.patch b/dev-libs/dvutil/files/dvutil-0.15.5-missing_includes.patch
deleted file mode 100644
index 38332c08b750..000000000000
--- a/dev-libs/dvutil/files/dvutil-0.15.5-missing_includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur dvutil-0.15.5.orig/dvutil/ntostr.C dvutil-0.15.5/dvutil/ntostr.C
---- dvutil-0.15.5.orig/dvutil/ntostr.C	2008-06-16 22:16:22.000000000 +0200
-+++ dvutil-0.15.5/dvutil/ntostr.C	2008-06-16 22:17:16.000000000 +0200
-@@ -5,6 +5,7 @@
- #include <stdio.h> // sprintf
- #include <stdlib.h> // strtod, strtol, strtoul
- #include <ctype.h> // tolower
-+#include <string.h>
- 
- namespace Dv {
- namespace Util {
diff --git a/dev-libs/dvutil/files/dvutil-1.0.10-asneeded.patch b/dev-libs/dvutil/files/dvutil-1.0.10-asneeded.patch
new file mode 100644
index 000000000000..1988ac394136
--- /dev/null
+++ b/dev-libs/dvutil/files/dvutil-1.0.10-asneeded.patch
@@ -0,0 +1,131 @@
+diff -ruN dvutil-1.0.10.orig/configure.ac dvutil-1.0.10/configure.ac
+--- dvutil-1.0.10.orig/configure.ac	2009-12-05 14:12:00.000000000 +0200
++++ dvutil-1.0.10/configure.ac	2010-03-06 23:47:40.000000000 +0200
+@@ -89,19 +89,25 @@
+ #   DV_REQUIRE_CFUNC(SHA1,ssl)
+ # fi
+ 
+-DV_CHECK_CFUNC(SHA1,ssl)
+-DV_CHECK_CFUNC(MD5,ssl)
+-if test "${dv_ac_func_MD5}" = "yes"; then
+-  if test "${dv_ac_func_SHA1}" = "yes"; then
+-    have_openssl="yes"
+-  else
+-    have_openssl="no"
+-  fi
+-else
+-  have_openssl="no"
++# DV_CHECK_CFUNC(SHA1,ssl)
++# DV_CHECK_CFUNC(MD5,ssl)
++# if test "${dv_ac_func_MD5}" = "yes"; then
++#   if test "${dv_ac_func_SHA1}" = "yes"; then
++#     have_openssl="yes"
++#   else
++#     have_openssl="no"
++#   fi
++# else
++#   have_openssl="no"
++# fi
++# AC_DEFINE([HAVE_OPENSSL],[HAVE_MD5 && HAVE_SHA1],[openssl available])
++# AC_SUBST(have_openssl)
++
++AC_ARG_WITH([ssl], AS_HELP_STRING([--with-ssl], [Build with ssl library (default: disabled)]))
++if test "x$with_ssl" == "xyes"; then
++   PKG_CHECK_MODULES([SSL], [libssl])
++   AC_DEFINE([HAVE_OPENSSL], [1], [openssl available])
+ fi
+-AC_DEFINE([HAVE_OPENSSL],[HAVE_MD5 && HAVE_SHA1],[openssl available])
+-AC_SUBST(have_openssl)
+ 
+ DV_REQUIRE_CFUNC(getgrnam)
+ DV_REQUIRE_CFUNC(chown)
+diff -ruN dvutil-1.0.10.orig/dvutil/Makefile.am dvutil-1.0.10/dvutil/Makefile.am
+--- dvutil-1.0.10.orig/dvutil/Makefile.am	2009-12-05 14:09:51.000000000 +0200
++++ dvutil-1.0.10/dvutil/Makefile.am	2010-03-06 23:20:32.000000000 +0200
+@@ -9,8 +9,8 @@
+ lib_LTLIBRARIES = libdvutil.la
+ 
+ libdvutil_la_LDFLAGS = -release @VERSION@ 
+-libdvutil_la_LIBADD = @LIBS@ 
+-libdvutil_la_CXXFLAGS = -Wno-deprecated -g -Wall -O3
++libdvutil_la_LIBADD = @LIBS@ @SSL_LIBS@
++libdvutil_la_CXXFLAGS = -Wno-deprecated -Wall @SSL_CFLAGS@
+ libdvutil_la_SOURCES = debug_dump.C strings.C strings.h props.h props.C \
+   date.h date.C period.h period.C getdate.c getdate.h \
+   file.C file.h user.C user.h fdstreambuf.h fdstreambuf.C makedaemon.h makedaemon.C \
+diff -ruN dvutil-1.0.10.orig/m4/dvfuncs.m4 dvutil-1.0.10/m4/dvfuncs.m4
+--- dvutil-1.0.10.orig/m4/dvfuncs.m4	1970-01-01 02:00:00.000000000 +0200
++++ dvutil-1.0.10/m4/dvfuncs.m4	2010-03-06 23:24:17.000000000 +0200
+@@ -0,0 +1,60 @@
++dnl =====================================================================
++dnl DV_REQUIRE_CFUNC(   function [$1],          crypt
++dnl                     libraries [$2])         [ crypt crypto ]
++dnl =====================================================================
++dnl This macro verifies that the C function $1 is available, if necesssary
++dnl after linking with one of the libraries in $2 (without lib prefix). 
++dnl The library for which linking succeeds is added to $LIBS.
++dnl =====================================================================
++AC_DEFUN([DV_REQUIRE_CFUNC],
++[
++AC_LANG_PUSH(C)
++AC_CHECK_FUNC($1,, [ AC_SEARCH_LIBS($1,"$2",,AC_MSG_ERROR([need $1 function])) ])
++AC_LANG_POP(C)
++])
++
++dnl =====================================================================
++dnl DV_CHECK_CFUNC(     function [$1],          crypt
++dnl                     libraries [$2])         [ crypt crypto ]
++dnl =====================================================================
++dnl This macro checks whether the C function $1 is available, if necesssary
++dnl after linking with one of the libraries in $2 (without lib prefix). 
++dnl The library for which linking succeeds is added to $LIBS.
++dnl =====================================================================
++AC_DEFUN([DV_CHECK_CFUNC],
++[
++AC_LANG_PUSH(C)
++AC_CHECK_FUNC($1,[ AC_DEFINE(HAVE_$1, [1], [C function $1]) ],
++  [ AC_SEARCH_LIBS($1,"$2", AC_DEFINE(HAVE_$1, [1], [C function $1 in $2])) ])
++AC_LANG_POP(C)
++])
++dnl =====================================================================
++dnl DV_REQUIRE_PROG(
++dnl         pathvar[$1],      [ GZIP ]
++dnl            program-name[$2], [ gzip ]
++dnl            bin-dirs[$3],     [ [/usr/bin /usr/local/bin] ]
++dnl =====================================================================
++dnl Find out where program-name is, checking directories in bin-dirs.
++dnl Set pathvar if found and abort if not found
++dnl =====================================================================
++AC_DEFUN([DV_REQUIRE_PROG],
++[
++$1=""
++AM_PATH_PROG_WITH_TEST($1,$2,true, ,[$3])
++if test -z "$$1"; then
++  AC_MSG_ERROR([program $2 not found])
++fi
++])
++
++AC_DEFUN([DV_APPEND_UNIQ],
++[
++{ echo "${$2}" | grep -- "$1 " >/dev/null || $2="${$2} $1"; }dnl
++])
++
++AC_DEFUN([DV_SET_LIBTOOL],
++[
++AC_ARG_WITH(libtool,
++  [  --with-libtool=path     path of libtool program], 
++dv_lt=$withval,dv_lt="libtool")
++])
++
+diff -ruN dvutil-1.0.10.orig/Makefile.am dvutil-1.0.10/Makefile.am
+--- dvutil-1.0.10.orig/Makefile.am	2009-02-09 17:07:09.000000000 +0200
++++ dvutil-1.0.10/Makefile.am	2010-03-06 23:13:41.000000000 +0200
+@@ -1,6 +1,6 @@
+ # $Header: /var/cvsroot/gentoo-x86/dev-libs/dvutil/files/dvutil-1.0.10-asneeded.patch,v 1.1 2010/03/06 21:45:53 ssuominen Exp $
+-ACLOCAL_AMFLAGS=-I m4 -I /usr/local/share/aclocal
+-SUBDIRS =  dvutil doc m4
++ACLOCAL_AMFLAGS = -I m4
++SUBDIRS = dvutil m4
+ 
+ maintainer-check: distcheck
+ 	@:
diff --git a/dev-libs/dvutil/files/dvutil-1.0.5-gcc44.patch b/dev-libs/dvutil/files/dvutil-1.0.5-gcc44.patch
deleted file mode 100644
index 456bfb09bebe..000000000000
--- a/dev-libs/dvutil/files/dvutil-1.0.5-gcc44.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- dvutil-1.0.5.orig/dvutil/debug_dump.C	2008-03-14 22:44:10.000000000 +0100
-+++ dvutil-1.0.5/dvutil/debug_dump.C	2009-10-30 21:21:17.211325923 +0100
-@@ -1,4 +1,5 @@
- // $Id: dvutil-1.0.5-gcc44.patch,v 1.1 2010/03/06 20:44:28 ssuominen Exp $
-+#include <stdint.h>
- #include <ctype.h>
- #include <iomanip>
- 
---- dvutil-1.0.5.orig/dvutil/props.C	2008-03-14 22:44:10.000000000 +0100
-+++ dvutil-1.0.5/dvutil/props.C	2009-10-30 21:22:31.245328026 +0100
-@@ -1,6 +1,7 @@
- // $Id: dvutil-1.0.5-gcc44.patch,v 1.1 2010/03/06 20:44:28 ssuominen Exp $
- 
- #include <ctype.h>
-+#include <cstdio>
- #include <unistd.h> // environ
- #include <string.h> // strchr
- #include <dvutil/props.h>
---- dvutil-1.0.5.orig/dvutil/filterstreambuf.h	2008-03-16 16:17:26.000000000 +0100
-+++ dvutil-1.0.5/dvutil/filterstreambuf.h	2009-10-30 21:23:13.555577358 +0100
-@@ -3,6 +3,8 @@
- // $Id: dvutil-1.0.5-gcc44.patch,v 1.1 2010/03/06 20:44:28 ssuominen Exp $
- 
- #include <iostream>
-+#include <cstdio>
-+
- /** @file 
-  * The Dv::Util::filterstreambuf class is a template class that
-  * is used to define Dv::Util::filterstream objects.