From: Tomas Chvatal Date: Wed, 28 Dec 2011 14:54:54 +0000 (+0000) Subject: Remove overshadowed versions. Bump latest to eapi4. Remove libtool archive. Provide... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9e7311fa99ea7e0d85dceb19568fb4cb177c097f;p=gentoo.git Remove overshadowed versions. Bump latest to eapi4. Remove libtool archive. Provide static-libs useflag. Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- diff --git a/dev-libs/libdaemon/ChangeLog b/dev-libs/libdaemon/ChangeLog index fadb39104f1e..f23d253d0013 100644 --- a/dev-libs/libdaemon/ChangeLog +++ b/dev-libs/libdaemon/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/libdaemon # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdaemon/ChangeLog,v 1.71 2011/03/05 12:29:31 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdaemon/ChangeLog,v 1.72 2011/12/28 14:54:54 scarabeus Exp $ + + 28 Dec 2011; Tomáš Chvátal -libdaemon-0.12.ebuild, + -libdaemon-0.13-r1.ebuild, -files/libdaemon-0.13-bsd.patch, + libdaemon-0.14-r1.ebuild: + Remove overshadowed versions. Bump latest to eapi4. Remove libtool archive. + Provide static-libs useflag. 05 Mar 2011; Raúl Porcel libdaemon-0.14-r1.ebuild: alpha/arm/ia64/s390/sh/sparc stable wrt #355583 diff --git a/dev-libs/libdaemon/Manifest b/dev-libs/libdaemon/Manifest index 4d8afbc0663d..96bbd4c83ec5 100644 --- a/dev-libs/libdaemon/Manifest +++ b/dev-libs/libdaemon/Manifest @@ -1,21 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 -AUX libdaemon-0.13-bsd.patch 1276 RMD160 adbdcecd89492011034c1d2d9519f01a571188e6 SHA1 cd322f918c4d84e5c723b34e551451f3ff879892 SHA256 56211ce64e377a38caf76c133ee4cc4467432fef52bb1a91947d9cff5783731e -DIST libdaemon-0.12.tar.gz 355167 RMD160 ccadae8f8dcac3ddac154cc7e1e1d47da8302c7d SHA1 2b45ab37df853afd25f7985ed699b799e0464413 SHA256 39e7c9f8644d1af310d076c1a5cc648040033e4724e7edfd85eb983ad88336d0 -DIST libdaemon-0.13.tar.gz 368119 RMD160 7fc41dc7a147d969b29e5a359442716859de7e0e SHA1 2c67eedf0dfe303a86bee64feba3e40d21abbd01 SHA256 bd949d459d2da54f1cdfbd1f4592e32541e8a195aca56fa7a8329ed79836d709 DIST libdaemon-0.14.tar.gz 340474 RMD160 952ae993fecfe3ec765dfa43b2690a83f1a5c939 SHA1 78a4db58cf3a7a8906c35592434e37680ca83b8f SHA256 fd23eb5f6f986dcc7e708307355ba3289abe03cc381fc47a80bca4a50aa6b834 -EBUILD libdaemon-0.12.ebuild 1142 RMD160 6f12eb49e5e194987c16940182d9d876a3dfca42 SHA1 1f7e435e503420f316894dca424b2e7cf15cebf9 SHA256 3ea2bf38f0e708032fa2afa5d1c34a16f47021718b330ea9f30ade2ae8582b42 -EBUILD libdaemon-0.13-r1.ebuild 1194 RMD160 c17664b290fd539801b5ce0efc367d315d65d1eb SHA1 5e75c879174374fc31e0964e6ae03a65cd9d6055 SHA256 086eaf91429a10f64239b9ac993c1ca2aa0165d066d88e99ee7e831984ebe2e1 -EBUILD libdaemon-0.14-r1.ebuild 1353 RMD160 271fe05e4ff3c9f4cc2b194a4867a4b456847c4f SHA1 846e99d61b67b2031b9fc3107e35185a39c70f09 SHA256 dfa640f892c429e0f5749627b391a9e55b7e48fa5662eebd8a3a8f6c56ed153c -MISC ChangeLog 8976 RMD160 0e20d2ae7d69fdffe30c96e829372318571b48fd SHA1 bda5d2b46c1118cd2f0ca9a5ea6147ee38b7bfb0 SHA256 3c9de6432fc66ce6f8b366093b5c46a968c48dce819744cce00efff52f3a4fc8 +EBUILD libdaemon-0.14-r1.ebuild 1302 RMD160 c4cfe6c5148dcf0d5c87ab0244ae78f435831ae6 SHA1 8af98a59ce31f4bd8c91752de405867c956f9048 SHA256 82ae6848811c92ce31433633cc4cd3f92348731c119182881c835a2957603446 +MISC ChangeLog 9257 RMD160 4508c6f69f29de4e944ad9b7e514fe641281d1c4 SHA1 34e7f24dd92d7750b2d688b5326c9a368c2d0b45 SHA256 61e928ce9184116030c297663762f2fabc02eb54462d31af4f17571890a8d1bd MISC metadata.xml 200 RMD160 09479e88483bfffb348985f8534480b6013de139 SHA1 f0654d363711f5d8e448b13b1a2b41c1c563c4f4 SHA256 bab99cb948fd01a5ef32604f22ef14c5ca84996659e9ad2c2c416391b5e2024a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQEIAAYFAk59C7UACgkQfXuS5UK5QB18kAP/THlV//rOul/zUubIXfDbmn1m -sYssGNgEhwYSU0fnCbO5zUuKJTERIWXcpW44d2YmMkw1NrxPl+ce1C4tlP+QO7Tz -FPMneWm44CtomSKO9vGv+vDFiQPaJyZwaqbz8JWqXXiL3Q4fczbZE2xQbK6ZBnt+ -vcf4FeG4+XgzyQY0dNM= -=SkDD +iQIcBAEBAgAGBQJO+y2/AAoJEOSiRoyO7jvompwP/Ax/hCXXN9IP56ohT7qylRKA +79kZuEba9KTR2k2tjueU3Q+Uyhcm30P6k7d4t1vnDQw4CoDyXH3d924y9CVk7+lq +5K4CPoLCvIzCU+vAbsC3NnWULPa6/jRSkJw9OKRY1cqQuV1j0ri8BlJyUKYi8alq +3ZY4Yr1CxfuGjLfRGWpkp3aYHFOvD3N+CIh58lRK6Sx2XpCybGCyMpVpmHgC6W+u +P0AGQDEPxKbmlMPzUoAF9FUKDsfBI2mHLunN/oIDXJyoWV8O+bWVk8hAzYjnHu9E +r62vdY87CAqHZnrpY+cRvedRNvxzSAg0d/++BkuoZjfcdujTEDWXpN9ja9/7ZyaG +YqBc1C5T7yJHObgTF6C3jT1DgxjuNVxdqMP+xQAoK1U4PzLSUhitRxB+sRo64qPO +5iiw9DV0jC6CSTb9iU+Tv4O4qJXk7GO6MVCVx/5IQkRzqMxNhTWtBhNR2+Xjclh4 +5zKiPcxuCXwxZCzIPw5FYz18e+uLsZ7V1NLG5EqWf2tfKNmhvuB2yVwyb3qtVx7y +pAYXae/kWQCtvJcsNBTqS7+fiXxnYyjwh66u6132z04NBIFdinTN8eHFpP/uDi/Y +sddTy657J5f1hGxM2ONVfCidYVgpOxH3p7UTPnOYNmDphxiZu6j4zFAA8tS7mIrz +59EQ7J6Rq3j8svJiz+o3 +=Q0Rv -----END PGP SIGNATURE----- diff --git a/dev-libs/libdaemon/files/libdaemon-0.13-bsd.patch b/dev-libs/libdaemon/files/libdaemon-0.13-bsd.patch deleted file mode 100644 index 8a439d52a62e..000000000000 --- a/dev-libs/libdaemon/files/libdaemon-0.13-bsd.patch +++ /dev/null @@ -1,39 +0,0 @@ -commit 5b1daf072556c1fc9a00e8735fa0cdba280c2231 -Author: Diego 'Flameeyes' Pettenò -Date: Wed Oct 1 13:26:32 2008 +0200 - - Fix building on OpenSolaris (without _NSIG definition). - - On OpenSolaris, the _NSIG macro is not defined, but NSIG is; as it's - not possible to use NSIG under glibc (it would miss the SIGRT* - series), define a SIGNAL_UPPER_BOUND depending on the system (and - error out if the system lacks both NSIG and _NSIG). - -diff --git a/libdaemon/dfork.c b/libdaemon/dfork.c -index f1ba7c1..6b94944 100644 ---- a/libdaemon/dfork.c -+++ b/libdaemon/dfork.c -@@ -42,6 +42,14 @@ - #include "dnonblock.h" - #include "dlog.h" - -+#if defined(_NSIG) /* On glibc NSIG does not count RT signals */ -+# define SIGNAL_UPPER_BOUND _NSIG -+#elif defined(NSIG) /* Solaris defines just this */ -+# define SIGNAL_UPPER_BOUND NSIG -+#else -+# error "Unknown upper bound for signals" -+#endif -+ - static int _daemon_retval_pipe[2] = { -1, -1 }; - - static int _null_open(int f, int fd) { -@@ -665,7 +673,7 @@ int daemon_reset_sigs(int except, ...) { - int daemon_reset_sigsv(const int except[]) { - int sig; - -- for (sig = 1; sig < _NSIG; sig++) { -+ for (sig = 1; sig < SIGNAL_UPPER_BOUND; sig++) { - int reset = 1; - - switch (sig) { diff --git a/dev-libs/libdaemon/libdaemon-0.12.ebuild b/dev-libs/libdaemon/libdaemon-0.12.ebuild deleted file mode 100644 index d219478afc52..000000000000 --- a/dev-libs/libdaemon/libdaemon-0.12.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# 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.12.ebuild,v 1.11 2008/11/09 12:12:07 vapier Exp $ - -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" - -LICENSE="LGPL-2.1" -SLOT="0" -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} - - elibtoolize -} - -src_compile() { - econf --disable-lynx || die "econf failed" - emake || die "emake failed" - - if use doc ; then - einfo "Building documentation" - make doxygen || die "make doxygen failed" - fi -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - if use doc; then - ln -sf doc/reference/html reference - dohtml -r doc/README.html reference - doman doc/reference/man/man*/* - fi - - if use examples; then - docinto examples - dodoc examples/testd.c - fi - - dodoc README -} diff --git a/dev-libs/libdaemon/libdaemon-0.13-r1.ebuild b/dev-libs/libdaemon/libdaemon-0.13-r1.ebuild deleted file mode 100644 index 86e6e0df35ce..000000000000 --- a/dev-libs/libdaemon/libdaemon-0.13-r1.ebuild +++ /dev/null @@ -1,51 +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/libdaemon/libdaemon-0.13-r1.ebuild,v 1.8 2009/12/15 19:34:14 armin76 Exp $ - -inherit libtool eutils - -DESCRIPTION="Simple library for creating daemon processes in C" -HOMEPAGE="http://0pointer.de/lennart/projects/libdaemon/" -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 examples" - -RDEPEND="" -DEPEND="doc? ( app-doc/doxygen )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}-bsd.patch" - elibtoolize -} - -src_compile() { - econf --disable-lynx --localstatedir=/var - emake || die "emake failed" - - if use doc ; then - einfo "Building documentation" - make doxygen || die "make doxygen failed" - fi -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - if use doc; then - ln -sf doc/reference/html reference - dohtml -r doc/README.html reference - doman doc/reference/man/man*/* - fi - - if use examples; then - docinto examples - dodoc examples/testd.c - fi - - dodoc README -} diff --git a/dev-libs/libdaemon/libdaemon-0.14-r1.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r1.ebuild index 59fc3070d6fa..4c42c899a840 100644 --- a/dev-libs/libdaemon/libdaemon-0.14-r1.ebuild +++ b/dev-libs/libdaemon/libdaemon-0.14-r1.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdaemon/libdaemon-0.14-r1.ebuild,v 1.6 2011/03/05 12:29:31 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdaemon/libdaemon-0.14-r1.ebuild,v 1.7 2011/12/28 14:54:54 scarabeus Exp $ + +EAPI=4 inherit libtool eutils @@ -11,39 +13,46 @@ 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 examples" +IUSE="doc examples static-libs" RDEPEND="" DEPEND="doc? ( app-doc/doxygen )" -src_compile() { +DOCS=( "README" ) + +src_configure() { econf \ - --docdir=/usr/share/doc/${PF} \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ --localstatedir=/var \ --disable-examples \ - --disable-lynx - emake || die "emake failed" + --disable-lynx \ + $(use_enable static-libs static) +} + +src_compile() { + emake if use doc ; then einfo "Building documentation" - emake doxygen || die "make doxygen failed" + emake doxygen fi } src_install() { - emake DESTDIR="${D}" install || die "make install failed" + default + + find "${ED}" -name '*.la' -exec rm -f {} + if use doc; then ln -sf doc/reference/html reference - dohtml -r doc/README.html doc/style.css reference || die "dohtml failed" - doman doc/reference/man/man*/* || die "doman failed" + dohtml -r doc/README.html doc/style.css reference + doman doc/reference/man/man*/* fi if use examples; then docinto examples - dodoc examples/testd.c || die "dodoc 1 failed" + dodoc examples/testd.c fi - rm -rf "${D}"/usr/share/doc/${PF}/{README.html,style.css} || die "rm failed" - dodoc README || die "dodoc 2 failed" + rm -rf "${ED}"/usr/share/doc/${PF}/{README.html,style.css} || die "rm failed" }