Fix building with new libtool, wrt bug #535936, thanks to Toralf Förster <toralf.foerster AT gmx.de> for reporting this issue. Drop old

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x60C0742D1F357D42)

5 files changed, 22 insertions, 114 deletions

diff --git a/dev-cpp/rudiments/ChangeLog b/dev-cpp/rudiments/ChangeLog
index 0d281d40f519..9574f3ffe0a6 100644
--- a/dev-cpp/rudiments/ChangeLog
+++ b/dev-cpp/rudiments/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/rudiments
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/rudiments/ChangeLog,v 1.17 2014/05/03 22:40:26 pinkbyte Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/rudiments/ChangeLog,v 1.18 2015/03/11 12:48:38 pinkbyte Exp $
+
+  11 Mar 2015; Sergey Popov <pinkbyte@gentoo.org> -rudiments-0.40.ebuild,
+  rudiments-0.46.ebuild, -files/0.40-configure.patch,
+  files/rudiments-0.46-buildsystem.patch:
+  Fix building with new libtool, wrt bug #535936, thanks to Toralf Förster
+  <toralf.foerster AT gmx.de> for reporting this issue. Drop old
 
 *rudiments-0.46 (03 May 2014)
 
diff --git a/dev-cpp/rudiments/files/0.40-configure.patch b/dev-cpp/rudiments/files/0.40-configure.patch
deleted file mode 100644
index 80fc3434649d..000000000000
--- a/dev-cpp/rudiments/files/0.40-configure.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/config.mk.in b/config.mk.in
-index ae29f27..c0b7e3d 100644
---- a/config.mk.in
-+++ b/config.mk.in
-@@ -11,7 +11,7 @@ includedir = @includedir@
- libdir = @libdir@
- mandir = @mandir@
- datadir = @datadir@
--docdir = ${datadir}/doc/rudiments
-+docdir = @docdir@
- 
- # compiler to use
- CC = @CC@
-diff --git a/configure.in b/configure.in
-index d82ea0e..290a80b 100644
---- a/configure.in
-+++ b/configure.in
-@@ -28,7 +28,7 @@ AC_ARG_WITH(pthread-prefix,
- 	PTHREADPATH="")
- AC_ARG_ENABLE(ssl,
- 	[  --disable-ssl           Disable SSL support],
--	ENABLE_RUDIMENTS_SSL="no",
-+	ENABLE_RUDIMENTS_SSL="$enableval",
- 	ENABLE_RUDIMENTS_SSL="yes")
- AC_ARG_WITH(ssl-includes,
- 	[  --with-ssl-includes     SSL includes],
-@@ -40,7 +40,7 @@ AC_ARG_WITH(ssl-libs,
- 	SSLLIBS="")
- AC_ARG_ENABLE(pcre,
- 	[  --disable-pcre          Don't use PCRE for regular expressions],
--	ENABLE_RUDIMENTS_PCRE="no",
-+	ENABLE_RUDIMENTS_PCRE="$enableval",
- 	ENABLE_RUDIMENTS_PCRE="yes")
- AC_ARG_WITH(pcre-includes,
- 	[  --with-pcre-includes    PCRE includes],
-@@ -56,7 +56,7 @@ AC_ARG_ENABLE(built-in-regex,
- 	USE_BUILT_IN_REGULAREXPRESSION="0")
- AC_ARG_ENABLE(threads,
- 	[  --disable-threads       Disable thread support],
--	ENABLE_RUDIMENTS_THREADS="no",
-+	ENABLE_RUDIMENTS_THREADS="$enableval",
- 	ENABLE_RUDIMENTS_THREADS="yes")
- 
- dnl   options to disable building various classes
-@@ -3393,6 +3393,10 @@ if ( test "`echo $datadir | cut -c1`" = "/" )
- then
- 	datadir='${DESTDIR}'"$datadir"
- fi
-+if ( test "`echo $docdir | cut -c1`" = "/" )
-+then
-+	docdir='${DESTDIR}'"$docdir"
-+fi
- 
- 
- dnl Output files.
-diff --git a/src/Makefile.in b/src/Makefile.in
-index a224d83..3b990fb 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -4,7 +4,7 @@ include ../config.mk
- 
- .PHONY: all clean install uninstall
- 
--CPPFLAGS = $(WERROR) $(BASECPPFLAGS) -I../ -I../include @EXTRACPPFLAGS@
-+CPPFLAGS = $(BASECPPFLAGS) -I../ -I../include @EXTRACPPFLAGS@
- 
- SRCS = namevaluepairs.cpp winsock.cpp @SRCS@
- LOBJS = namevaluepairs.lo winsock.lo @LOBJS@
diff --git a/dev-cpp/rudiments/files/rudiments-0.46-buildsystem.patch b/dev-cpp/rudiments/files/rudiments-0.46-buildsystem.patch
index 60710f0a95b2..fa869c89144a 100644
--- a/dev-cpp/rudiments/files/rudiments-0.46-buildsystem.patch
+++ b/dev-cpp/rudiments/files/rudiments-0.46-buildsystem.patch
@@ -20,10 +20,10 @@ index ae29f27..c0b7e3d 100644
  
  # debug and optimization flags (-g, -O2, etc.)
  # NOTE: -FPIC gets added if we're not using libtool
-diff --git a/configure.in b/configure.in
+diff --git a/configure.ac b/configure.ac
 index d82ea0e..290a80b 100644
---- a/configure.in
-+++ b/configure.in
+--- a/configure.ac
++++ b/configure.ac
 @@ -28,7 +28,7 @@ AC_ARG_WITH(pthread-prefix,
  	PTHREADPATH="")
  AC_ARG_ENABLE(ssl,
diff --git a/dev-cpp/rudiments/rudiments-0.40.ebuild b/dev-cpp/rudiments/rudiments-0.40.ebuild
deleted file mode 100644
index 081e8f0cb752..000000000000
--- a/dev-cpp/rudiments/rudiments-0.40.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/rudiments/rudiments-0.40.ebuild,v 1.1 2013/02/07 10:05:32 dev-zero Exp $
-
-EAPI="5"
-
-inherit autotools eutils
-
-DESCRIPTION="C++ class library for daemons, clients and servers"
-HOMEPAGE="http://rudiments.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rudiments/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug pcre ssl static-libs"
-
-DEPEND="pcre? ( dev-libs/libpcre )
-	ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-configure.patch"
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		--docdir="/usr/share/doc/${PF}/html" \
-		$(use_enable debug) \
-		$(use_enable pcre) \
-		$(use_enable ssl) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-cpp/rudiments/rudiments-0.46.ebuild b/dev-cpp/rudiments/rudiments-0.46.ebuild
index 6b9973f071dc..21a5f485f47d 100644
--- a/dev-cpp/rudiments/rudiments-0.46.ebuild
+++ b/dev-cpp/rudiments/rudiments-0.46.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/rudiments/rudiments-0.46.ebuild,v 1.1 2014/05/03 22:40:26 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/rudiments/rudiments-0.46.ebuild,v 1.2 2015/03/11 12:48:38 pinkbyte Exp $
 
 EAPI="5"
 
@@ -23,6 +23,15 @@ RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" )
 
+src_prepare() {
+	mv configure.in configure.ac || die
+
+	# bug #535936
+	rm aclocal.m4 || die
+
+	autotools-utils_src_prepare
+}
+
 src_configure() {
 	local myeconfargs=(
 		--docdir="/usr/share/doc/${PF}/html" \