From d3ab98f9fa4326682bf3aaa6cbcb24ba17511ba9 Mon Sep 17 00:00:00 2001 From: Sergey Popov Date: Wed, 11 Mar 2015 12:48:39 +0000 Subject: [PATCH] =?utf8?q?Fix=20building=20with=20new=20libtool,=20wrt=20b?= =?utf8?q?ug=20#535936,=20thanks=20to=20Toralf=20F=C3=B6rster=20=20for=20reporting=20this=20issue.=20Drop?= =?utf8?q?=20old?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0x60C0742D1F357D42 --- dev-cpp/rudiments/ChangeLog | 10 ++- dev-cpp/rudiments/Manifest | 25 +++---- dev-cpp/rudiments/files/0.40-configure.patch | 68 ------------------- .../files/rudiments-0.46-buildsystem.patch | 6 +- dev-cpp/rudiments/rudiments-0.40.ebuild | 39 ----------- dev-cpp/rudiments/rudiments-0.46.ebuild | 13 +++- 6 files changed, 33 insertions(+), 128 deletions(-) delete mode 100644 dev-cpp/rudiments/files/0.40-configure.patch delete mode 100644 dev-cpp/rudiments/rudiments-0.40.ebuild 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 -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 + for reporting this issue. Drop old *rudiments-0.46 (03 May 2014) diff --git a/dev-cpp/rudiments/Manifest b/dev-cpp/rudiments/Manifest index 11684d0c2744..693ae1e477f7 100644 --- a/dev-cpp/rudiments/Manifest +++ b/dev-cpp/rudiments/Manifest @@ -1,22 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX 0.40-configure.patch 2002 SHA256 ff9a313b3efe0213608919e50fd9ecfd22dc43b690ef073688724732382448a1 SHA512 9c1f3fbf42c1c26f3f5d5717bc68205b77ecd1741cccf71d1adf9c5e83e519079a19e272b473123b8590a67499f0cb47a20b27afe10affdf53aa57544ac71825 WHIRLPOOL 70d90c68a63a4251d4026645c13a8df302791b8ee18399e6daf25be874ce9331bb1f150decd00f554bbef26d4f7be9734c0f06a295c9bc8fe9a9c04ce63ba8f7 -AUX rudiments-0.46-buildsystem.patch 2944 SHA256 57b5540a95543767b0f0a6023c2edb011f9cf37f941708401e5779c5717865bb SHA512 a4b5e66925b9f240f7c650985526e0be55fa82ab2854e4fd6831444e9c699a744e063a7b067a878f678ba2ac37f55e0dc5237e2b7c89d93ef0fd27bf03813b7c WHIRLPOOL f81c896b03fbfdf2722cadf6f582404b3bb3bdf0b0bcd9a6d03d3bf8401f3db97335dfd925da7d268a63402076910558d46d5e295a8aba1f445651ae38d10af4 -DIST rudiments-0.40.tar.gz 1469860 SHA256 763466daed63dd26553b198816626e702d8677fdb7f91786c1a1dbd4f704c044 SHA512 2d35b9c83a333865c69fafd260eea1f85e523df213b826bd0ed9796af688f4bfd97fda5353b17f6145b11ce37853a48b793a95b353b78822b365119ede023470 WHIRLPOOL 03cc2a7f48a7e5deae2dc095c8138fdba30ad9bfa486f7bc1e3276b5310cec368e43815a13139d40ce8936037ca4eec89ed1ec3254aecfe7c0b1671e6e771824 +AUX rudiments-0.46-buildsystem.patch 2944 SHA256 4efd30fa3648b37b72ad12835ae2a02f029e80dc942a337ca78a4f08c1ad15fc SHA512 09fcb34274784f6446437060f42f9d4951af19d39f4d0b7ef1c77807f0d9415b1e13d4e4f846f16fddba44ed6482e14bc9ccce0c00f4f805ab5a37a6a2b91c57 WHIRLPOOL 1f227dca2fc184c19bbe96548f06ff15c84641cc8a0b1113251826a931e1fc476dd9d3565032190b458fd71bef4e44fa68497cd60e9ce796bbefeda25b401c7d DIST rudiments-0.46.tar.gz 1732565 SHA256 b59b830af52cdf5a361d73524efa0a7aa2f804011e07bf3855551ad07273d70a SHA512 2248db71c23ced4344dbdd26e9efe8c45f20da2e8e106101c762b334b8797dc62c47621c0477d42ac06fc665aa91b772e959802b10103c6256d1dbc68418f2f1 WHIRLPOOL 96cd3e778dbf2d52dc66b5c9ac02358ffd8409eb1ddc4dca5cb6327d5e962445763e1fea9d32bd01955a248f3391d3873bc48570e77bb2543d4cea9b4171fe15 -EBUILD rudiments-0.40.ebuild 896 SHA256 557ea2cc3f83f31b56c6cc3c51054f7470db9fcdc70f5b432fe9c4fbfba10a7e SHA512 2fd4225e62a77e28ca659cdb6fe9b6f03c34f2924d4550e94eacb861f6eb4113919b94836a36918f23d70cb09f29b0ea53358b1dad2cc93d04443f2d95f6eea2 WHIRLPOOL cb2a9d847862991fa480557f51a97b9a854a4746977f36a1f5b7684967426dbbc1aeb8ae0f17509923c5837e991c988cb3c686564de2eeae4dd3cf25983603e4 -EBUILD rudiments-0.46.ebuild 897 SHA256 ebf4e0f22c6535a6f11c4516d3bcc8ddeb6e5f04709630e9e2195376a0085b05 SHA512 606a5656af6528e199b1d247b0871c8254f67ac04552f3636e8b662a4baa4900a49cd1e45efca75016638e3bc57426d0484e889c076e574263055b18569fd6bb WHIRLPOOL d8a064e7c512a0ecda0bce67ad2efdcb54a41d3049a1d2e141965e243f1b0a2dabbf3b30939ab417e4c4c93b0a2ff969078079b8fcb2ced204df68a147931ba6 -MISC ChangeLog 2571 SHA256 fe2bde3efbfdec7148723140bc9e230381c770118dee977e91bdb4805300606d SHA512 f5941bbd445395617bed579820b820fa58f9b059e5003feca3df6b510e2235508e0ebc533bbeadf54da93e09a5a1a158bf1a34ba5ff0f2549b0f5e38bf946e03 WHIRLPOOL 7886e829e3242bb96be6ef61062650056d9034b85c2b274e33cc655d02c6eaca8fb81f6a989cc3db13859e6f634e54c8aca1078f3767cb8de947865f4ea2c6c6 +EBUILD rudiments-0.46.ebuild 1021 SHA256 0c5a36adb6f52b46889e77be65b1e6aa77bbdd46f7581f2013b175fbdcad9b62 SHA512 46d4d92ab5c44123d9814613f9bc70706ee663dc8eeda33f743d42639957ede7575ddc67c705331e9d62864970819ac555b87f3632ebb314b684930d99aa41fb WHIRLPOOL f68cf483c959a55624beec54db5fe4079b4dd33822e8defbc09232bc93b1d0a9620b3bdecf58a13e622d6a517c7f0f8958c79544143143cec43fdf1f8ae32dc5 +MISC ChangeLog 2883 SHA256 0c75f7ee7948d72b4eaf3367c1d704ae8f7321e8ce33032d71f5db10502a682f SHA512 664a494b1e06b6f1a481e1e19747282433c6833d1064077ca2087612470f40ace20d120871e54114f08e2537e4404d82a36a7dc0739f0e927b5048bb79493b3d WHIRLPOOL f8577ffab7990f3bfe542dc803a8f45c945f558c1081367eaf3b039b8d3be77d719b10b5d9a7141af1fe23d1e6897cdb79a8c8bd9326866f5e90b5bb854ac99d MISC metadata.xml 527 SHA256 56a6d1183ef6b557b28a37fc7633b7a95300b38a73efc638796ba4fe96ce07db SHA512 1a7b63c05e40030d75811b5aa691dc4b9b6c8d2aeac00f2d6f733b65cc5f5be4dcfae2351c9b8c1f961a3023cadd41ffdfe86b2bbce3cfc752301148312ce8ea WHIRLPOOL edb71908cfe6e9ad8c694dd07ff1a11ae1859785958bb510e0c1f53fede6bd5f98444b431ea68d87778095445fc0aae9dfa67b6d0420e5babb9594b85061e682 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iQEcBAEBCAAGBQJTZXBbAAoJECo/aRed9267i7AIAMQHKFwpEjaoNCTUX4Zcv6S0 -/9YtspmS+j0/xfLzvaNrMbWDVgHC78TyUctjWl9V1f31GalsgqgPfRMU/cKdniVD -7ubrFGfto0bQ3SGsIK5wY5cZPAlGOiKo9odRnBaV5EHsymvE9UO3k6zVUx/9h/pT -Rg1i1InUWTz1aKmgomZr9VcXFtvJy7S+knN6LHnzl/SByDbCjWhw+Gpaa92DCpNi -ln6I/enNHGc63udQ+BMJPhYX4HgsZDf/c8nqCTe++q2X8joxfHIrz300NQVNpb/I -dCw7iOUiVJfZ8t6SlcoePijBZrpp6QWYLuWzeZ0ui4R91La/MUnpUxomcwMju6E= -=Tu7g +iQEcBAEBCAAGBQJVADmlAAoJECo/aRed9267qccIAJ+Ia8jxO4ri3jY6KF+LCiKf +/G2EndXLNWJp0r1vQ38oI5p/1aEwJw7u6uA6dKGb9DQlu3Cxm9+SSWIFGikTEeee +2Fa/pG1+fRBI9Ej+k+BmdlPBQ+unoHE8VP63kZdc3wrZ8d81+8xOvvDGSe1YxbxC +8c+wKqRCrzpTbBAb2rdEbWRPQfj18Uznoe0ILIdTxlgdRqb0KNX5fVE+mqaCUJH7 +S5h9UsWwEI8/BlHOci9wu37kZSG+5FTkC4SGgjhlXMGadLrYIzE+3TEu4j8K4BYE +5z7Ev8AVHxyQJVSAHt57NZz4CPbVB7X23qyHLGVStpYR8B7xqkR5Cq7LI85GZz8= +=V5rv -----END PGP SIGNATURE----- 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" \ -- 2.26.2