diff options
| -rw-r--r-- | dev-cpp/rudiments/ChangeLog | 12 | ||||
| -rw-r--r-- | dev-cpp/rudiments/Manifest | 25 | ||||
| -rw-r--r-- | dev-cpp/rudiments/files/rudiments-0.46-buildsystem.patch | 88 | ||||
| -rw-r--r-- | dev-cpp/rudiments/rudiments-0.31.ebuild | 34 | ||||
| -rw-r--r-- | dev-cpp/rudiments/rudiments-0.32.ebuild | 34 | ||||
| -rw-r--r-- | dev-cpp/rudiments/rudiments-0.46.ebuild | 34 |
6 files changed, 144 insertions, 83 deletions
diff --git a/dev-cpp/rudiments/ChangeLog b/dev-cpp/rudiments/ChangeLog index d890669963ca..0d281d40f519 100644 --- a/dev-cpp/rudiments/ChangeLog +++ b/dev-cpp/rudiments/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-cpp/rudiments -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/rudiments/ChangeLog,v 1.16 2013/02/07 10:16:06 dev-zero Exp $ +# 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 $ + +*rudiments-0.46 (03 May 2014) + + 03 May 2014; Sergey Popov <pinkbyte@gentoo.org> -rudiments-0.31.ebuild, + -rudiments-0.32.ebuild, +rudiments-0.46.ebuild, + +files/rudiments-0.46-buildsystem.patch: + Version bump, wrt bug #488108. Update buildsystem patch - respect CFLAGS, + migrate to autotools-utils eclass. Drop old versions 07 Feb 2013; Tiziano Müller <dev-zero@gentoo.org> metadata.xml: Add upstream remote-id info. diff --git a/dev-cpp/rudiments/Manifest b/dev-cpp/rudiments/Manifest index 3ab5b3dcf837..11684d0c2744 100644 --- a/dev-cpp/rudiments/Manifest +++ b/dev-cpp/rudiments/Manifest @@ -2,22 +2,21 @@ Hash: SHA256 AUX 0.40-configure.patch 2002 SHA256 ff9a313b3efe0213608919e50fd9ecfd22dc43b690ef073688724732382448a1 SHA512 9c1f3fbf42c1c26f3f5d5717bc68205b77ecd1741cccf71d1adf9c5e83e519079a19e272b473123b8590a67499f0cb47a20b27afe10affdf53aa57544ac71825 WHIRLPOOL 70d90c68a63a4251d4026645c13a8df302791b8ee18399e6daf25be874ce9331bb1f150decd00f554bbef26d4f7be9734c0f06a295c9bc8fe9a9c04ce63ba8f7 -DIST rudiments-0.31.tar.gz 834376 SHA256 c35b69e918bad831e17edbab866c22eff11d083531bf0e15dafddb003f9c16d2 SHA512 1933ef21ce83c52c607cf513fd41c615cb8a9cd887ce6d7a4a5b3ea6a159893f6b40812ff6279baf9249dd35386c00a55641f4eece875c652578a92969eb1132 WHIRLPOOL ac10ccbd7fbc611f99cc828f40f3b8caebd46023b7075c81afd53e132689e2c40e0aecf4401346c57630bf4e215db8ea72108fbe8928972578fa98f024a6173a -DIST rudiments-0.32.tar.gz 668202 SHA256 aa3f3790b1b154201265c292d8e7c977fe6ca009a9ae557133a27c1e8d218fbe SHA512 d1b8d1df0fe046592152a7ff801f333a5f1cc6b7ee5ad6c8b944b6c29be5cb48169c5da9523da0b6ae4147a1b1a405f497e9aeee21ae04e5328f5f5771bda545 WHIRLPOOL 19e0defb10fb37c6b46f35cd33559524ca58fe6276520ba70103b45529af7a9eb22a11e964edfa45d4ac714bedbc0dbcaf672c3c4b6f18541f49ec57fd670f1c +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 -EBUILD rudiments-0.31.ebuild 1013 SHA256 7371acc2c869306c9ffc0d50dcae74f87808020c88a5625937a89d3dac0678b9 SHA512 5930f7240606a7539a5826908794188227ceefd30fbf279bfe2f618bbf4be3b503f210a997488b01cd911eb851a0c452e7c66ad7c6418feabeb242db31a4093e WHIRLPOOL 15737ce67607bf737140028b63c7bc1141d59eabc2520a9669832c315c81dcf3ab853327b749a84d3dbfc52d485d7b26a0efc74fe11f0cd7bf45b36830527faf -EBUILD rudiments-0.32.ebuild 1011 SHA256 d7d23264d784356e18debf0ba9ce58e9cb61ca6809afabb8662b8f1379881dae SHA512 c15c74c822f80512ec193c180d71a32c0a76462e036a11c2b71b371758dadbb97d74c63331343c863df4a2a798f058b28b9acd045bf15d23e31faa24145bf8e0 WHIRLPOOL a5fa29c1436569e677a443c7cd39085d7f40b462b4d1dba75061112a9bc5a07afb658450a9bfd018024a637e1e207d92c40b8d48dae8f754665fd08c05cf29c6 +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 -MISC ChangeLog 2241 SHA256 8adb025abb240e5c5278d646e0ca0df7b202b8e599ddcd71bc83bac982f9049a SHA512 141d177ad26207f389de5454968df9c02c2da9fb591e19a0e439bc924d6e1c0a81509c03cedd7376d096a47ef6426ed89f301e5a19221d76460f7335c0b7fe07 WHIRLPOOL f57ff97efe4b37bebf49c91dfbd985c595e65d9dee9f4af4941deed748651e19f87d00e701ab51f65ff19936f469c70084df9f5cdffc25ff50f2df2b49a46d5a +EBUILD rudiments-0.46.ebuild 897 SHA256 ebf4e0f22c6535a6f11c4516d3bcc8ddeb6e5f04709630e9e2195376a0085b05 SHA512 606a5656af6528e199b1d247b0871c8254f67ac04552f3636e8b662a4baa4900a49cd1e45efca75016638e3bc57426d0484e889c076e574263055b18569fd6bb WHIRLPOOL d8a064e7c512a0ecda0bce67ad2efdcb54a41d3049a1d2e141965e243f1b0a2dabbf3b30939ab417e4c4c93b0a2ff969078079b8fcb2ced204df68a147931ba6 +MISC ChangeLog 2571 SHA256 fe2bde3efbfdec7148723140bc9e230381c770118dee977e91bdb4805300606d SHA512 f5941bbd445395617bed579820b820fa58f9b059e5003feca3df6b510e2235508e0ebc533bbeadf54da93e09a5a1a158bf1a34ba5ff0f2549b0f5e38bf946e03 WHIRLPOOL 7886e829e3242bb96be6ef61062650056d9034b85c2b274e33cc655d02c6eaca8fb81f6a989cc3db13859e6f634e54c8aca1078f3767cb8de947865f4ea2c6c6 MISC metadata.xml 527 SHA256 56a6d1183ef6b557b28a37fc7633b7a95300b38a73efc638796ba4fe96ce07db SHA512 1a7b63c05e40030d75811b5aa691dc4b9b6c8d2aeac00f2d6f733b65cc5f5be4dcfae2351c9b8c1f961a3023cadd41ffdfe86b2bbce3cfc752301148312ce8ea WHIRLPOOL edb71908cfe6e9ad8c694dd07ff1a11ae1859785958bb510e0c1f53fede6bd5f98444b431ea68d87778095445fc0aae9dfa67b6d0420e5babb9594b85061e682 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) -iQEcBAEBCAAGBQJRE37nAAoJEB58/HceDKhfGr0H/2DHMOgN1UzUx+oNvn5J7vH5 -3F/6+rJGQ1kIlg4Q7uxZWsia8T2Htz9ItV8+1W2boHnK7msQTATmMFj1JXby9CLG -spTNFrP6WelLCS9yMF84Emhpjve0YPTi+a9B/3oDm8/LIflwH5dwlKH9HHU2O10k -dixUFfpY20X91U+DosVQmfctdeyNjmSA2KwmcrtR6lr7N+VKxr48egt2ONrO+pKQ -STTY8c0I8kAazIlP8+CxmSuyN1FwgEHZi7NjigpWe25ev9DSa+qbhEUGke10XZO1 -tVK4NqYGEQxSFbKDaRk72915kmfx+fN/QkqBdTwtHkaMeBSlGh9ijA1Ewuywc7A= -=m637 +iQEcBAEBCAAGBQJTZXBbAAoJECo/aRed9267i7AIAMQHKFwpEjaoNCTUX4Zcv6S0 +/9YtspmS+j0/xfLzvaNrMbWDVgHC78TyUctjWl9V1f31GalsgqgPfRMU/cKdniVD +7ubrFGfto0bQ3SGsIK5wY5cZPAlGOiKo9odRnBaV5EHsymvE9UO3k6zVUx/9h/pT +Rg1i1InUWTz1aKmgomZr9VcXFtvJy7S+knN6LHnzl/SByDbCjWhw+Gpaa92DCpNi +ln6I/enNHGc63udQ+BMJPhYX4HgsZDf/c8nqCTe++q2X8joxfHIrz300NQVNpb/I +dCw7iOUiVJfZ8t6SlcoePijBZrpp6QWYLuWzeZ0ui4R91La/MUnpUxomcwMju6E= +=Tu7g -----END PGP SIGNATURE----- diff --git a/dev-cpp/rudiments/files/rudiments-0.46-buildsystem.patch b/dev-cpp/rudiments/files/rudiments-0.46-buildsystem.patch new file mode 100644 index 000000000000..60710f0a95b2 --- /dev/null +++ b/dev-cpp/rudiments/files/rudiments-0.46-buildsystem.patch @@ -0,0 +1,88 @@ +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@ +@@ -21,7 +21,7 @@ + AR = @AR@ + + # includes and defines +-BASECPPFLAGS = @WALL@ @WERROR@ @CPPFLAGS@ @PTHREADINCLUDES@ @SSLINCLUDES@ @PCREINCLUDES@ ++BASECPPFLAGS = @WALL@ @CPPFLAGS@ @PTHREADINCLUDES@ @SSLINCLUDES@ @PCREINCLUDES@ + + # 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 +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"; INCLUDE_THREAD="0"; INCLUDE_THREADMUTEX="0", ++ ENABLE_RUDIMENTS_THREADS="$enableval"; INCLUDE_THREAD="0"; INCLUDE_THREADMUTEX="0", + ENABLE_RUDIMENTS_THREADS="yes") + + dnl options to disable building various classes +@@ -3716,6 +3716,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@ +--- a/acsite.m4 2014-05-04 01:44:03.265919456 +0400 ++++ b/acsite.m4 2014-05-04 01:44:34.008920936 +0400 +@@ -266,7 +237,7 @@ + dnl Sometimes -Wall includes -Wunused-variables and -Wunused-parameters + dnl which we don't care about. Disable it if it does. + OLDCPPFLAGS=$CPPFLAGS +- CPPFLAGS="$WALL $WERROR $CPPFLAGS" ++ CPPFLAGS="$WALL $CPPFLAGS" + AC_MSG_CHECKING(whether -Wall includes -Wunused-*) + AC_TRY_COMPILE([void f(int a) { return; }],[f(1);],AC_MSG_RESULT(no),WALL=""; AC_MSG_RESULT(yes)) + CPPFLAGS=$OLDCPPFLAGS diff --git a/dev-cpp/rudiments/rudiments-0.31.ebuild b/dev-cpp/rudiments/rudiments-0.31.ebuild deleted file mode 100644 index 5a2ff75672c3..000000000000 --- a/dev-cpp/rudiments/rudiments-0.31.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/rudiments/rudiments-0.31.ebuild,v 1.1 2008/04/04 01:10:49 halcy0n Exp $ - -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="~x86 ~amd64 ~ppc" -IUSE="debug pcre ssl" - -DEPEND="pcre? ( dev-libs/libpcre ) - ssl? ( dev-libs/openssl )" -RDEPEND="${DEPEND}" - -src_compile() { - # It's a buggy configure-script - # We can only disable, but not enable - local options - use pcre || options="${options} --disable-pcre" - use ssl || options="${options} --disable-ssl" - econf \ - $(use_enable debug) \ - ${options} \ - || die "econf failed" - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" docdir="${D}/usr/share/doc/${PF}/html" install || die "emake install failed" - dodoc AUTHORS ChangeLog NEWS README TODO -} diff --git a/dev-cpp/rudiments/rudiments-0.32.ebuild b/dev-cpp/rudiments/rudiments-0.32.ebuild deleted file mode 100644 index 53c0ec95710a..000000000000 --- a/dev-cpp/rudiments/rudiments-0.32.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/rudiments/rudiments-0.32.ebuild,v 1.1 2009/05/19 13:55:46 matsuu Exp $ - -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" - -DEPEND="pcre? ( dev-libs/libpcre ) - ssl? ( dev-libs/openssl )" -RDEPEND="${DEPEND}" - -src_compile() { - # It's a buggy configure-script - # We can only disable, but not enable - local options - use pcre || options="${options} --disable-pcre" - use ssl || options="${options} --disable-ssl" - econf \ - $(use_enable debug) \ - ${options} \ - || die "econf failed" - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" docdir="${D}/usr/share/doc/${PF}/html" install || die "emake install failed" - dodoc AUTHORS ChangeLog NEWS README TODO -} diff --git a/dev-cpp/rudiments/rudiments-0.46.ebuild b/dev-cpp/rudiments/rudiments-0.46.ebuild new file mode 100644 index 000000000000..6b9973f071dc --- /dev/null +++ b/dev-cpp/rudiments/rudiments-0.46.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2014 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 $ + +EAPI="5" + +AUTOTOOLS_AUTORECONF=1 +AUTOTOOLS_IN_SOURCE_BUILD=1 +inherit autotools-utils + +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:0 )" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" ) + +src_configure() { + local myeconfargs=( + --docdir="/usr/share/doc/${PF}/html" \ + $(use debug && "--enable-debug") \ + $(use_enable pcre) \ + $(use_enable ssl) + ) + autotools-utils_src_configure +} |