From: Mike Frysinger Date: Wed, 19 Oct 2011 17:27:02 +0000 (+0000) Subject: Initial ebuild merging the ChromeOS version, dev-zero, Bruno Tarquini, and my work... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e9e03f377c595de6edeb08b8a84affbf70392ea3;p=gentoo.git Initial ebuild merging the ChromeOS version, dev-zero, Bruno Tarquini, and my work #310093. Package-Manager: portage-2.2.0_alpha65/cvs/Linux x86_64 --- diff --git a/sys-libs/libnih/ChangeLog b/sys-libs/libnih/ChangeLog new file mode 100644 index 000000000000..b6c55cbfed94 --- /dev/null +++ b/sys-libs/libnih/ChangeLog @@ -0,0 +1,12 @@ +# ChangeLog for sys-libs/libnih +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libnih/ChangeLog,v 1.1 2011/10/19 17:27:02 vapier Exp $ + +*libnih-1.0.3 (19 Oct 2011) + + 19 Oct 2011; Mike Frysinger +libnih-1.0.3.ebuild, + +files/libnih-1.0.3-optional-dbus.patch, + +files/libnih-1.0.3-pkg-config.patch, +metadata.xml: + Initial ebuild merging the ChromeOS version, dev-zero, Bruno Tarquini, and my + work #310093. + diff --git a/sys-libs/libnih/Manifest b/sys-libs/libnih/Manifest new file mode 100644 index 000000000000..dc64bd5030ea --- /dev/null +++ b/sys-libs/libnih/Manifest @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX libnih-1.0.3-optional-dbus.patch 1162 RMD160 471beafeaeeb7fdd7289065ff4d90f6b5920b54a SHA1 9b4746fd48df7cccb4d815bf3270d5b95412fd84 SHA256 93e81914a402ebc512c7df46e00f85b54ed073a66fcf9fe465cb58d757546abf +AUX libnih-1.0.3-pkg-config.patch 2491 RMD160 c9d91e0ee30aa424c3a4e606a4f578e1e820efc8 SHA1 97546652dcda14ee8f251ec9fa7f98a2f319af40 SHA256 cefe32c74c2c23f991e78bb8eaf97da8bcd1b4f252c1aed334e75027568f24d7 +DIST libnih-1.0.3.tar.gz 1187624 RMD160 954df698ae272b5f9a30e191bf3deb382bd92d51 SHA1 db1f3e46a47f8a58f8179ca56f304d1550f41eb0 SHA256 897572df7565c0a90a81532671e23c63f99b4efde2eecbbf11e7857fbc61f405 +EBUILD libnih-1.0.3.ebuild 1254 RMD160 b7596beb9961cd39cbac8d93bbe1836fca354c69 SHA1 8ae70645855f27c764765b291b9e2acde5a7dea2 SHA256 86342ac1a27643ad1ede2d183ac846135aaa74595654bc481ecf27f4180a469e +MISC ChangeLog 499 RMD160 a8b940c7932c365f8482b32c5e3cf2dcf764b64d SHA1 d04257e6bc63ec83ef2996562e138bfed5c42243 SHA256 8aa870898d82a9d26a4cabcb49a956d870b744574538926e02ebf5fc34d8f6e7 +MISC metadata.xml 265 RMD160 d04c394332d55908cd27a1be72252bbc428fa014 SHA1 afbd8e2ed78b9b047b5964c3ab8fc9325a9c4a90 SHA256 392f5b2c28e89d50960bbd5320bae373a5a33f162ed4ecec8088696aad5d61f2 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iF4EAREIAAYFAk6fCG0ACgkQaC/OocHi7JYKOgD7BRHLDP4pHUCqxOArS6jLjGOQ +mf/ao69XY9ssOwB301sA/3JiQQO6nVNKQZs8v0JMHZEcLsYEeG/MdzwpOg5644n1 +=T2RX +-----END PGP SIGNATURE----- diff --git a/sys-libs/libnih/files/libnih-1.0.3-optional-dbus.patch b/sys-libs/libnih/files/libnih-1.0.3-optional-dbus.patch new file mode 100644 index 000000000000..afe43749b6b0 --- /dev/null +++ b/sys-libs/libnih/files/libnih-1.0.3-optional-dbus.patch @@ -0,0 +1,40 @@ +--- libnih-1.0.1/configure.ac ++++ libnih-1.0.1/configure.ac +@@ -23,12 +23,21 @@ + PKG_PROG_PKG_CONFIG([0.22]) + + # Checks for libraries. +-PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.2.16]) +-AC_CHECK_LIB([expat], [XML_ParserCreate], ++AC_ARG_WITH([dbus], ++ [AS_HELP_STRING([--without-dbus], ++ [disable support for dbus])], ++ [], ++ [with_dbus=yes]) ++ ++AS_IF([test "x$with_dbus" != xno],[ ++ PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.2.16]) ++ AC_CHECK_LIB([expat], [XML_ParserCreate], + [AC_CHECK_LIB([expat], [XML_StopParser], + [AC_SUBST([EXPAT_LIBS], [-lexpat])], + [AC_MSG_ERROR([expat >= 2.0.0 required])])], +- [AC_MSG_ERROR([expat library not found])]) ++ [AC_MSG_ERROR([expat library not found])])]) ++ ++AM_CONDITIONAL([DBUS_SUPPORT], [test "x$with_dbus" != xno]) + + # Checks for header files. + AC_CHECK_HEADERS([valgrind/valgrind.h]) +--- libnih-1.0.1.orig/Makefile.am ++++ libnih-1.0.1/Makefile.am +@@ -1,6 +1,9 @@ + ## Process this file with automake to produce Makefile.in + +-SUBDIRS = m4 intl nih nih-dbus nih-dbus-tool po ++SUBDIRS = m4 intl nih po ++if DBUS_SUPPORT ++SUBDIRS += nih-dbus nih-dbus-tool ++endif + + EXTRA_DIST = HACKING + diff --git a/sys-libs/libnih/files/libnih-1.0.3-pkg-config.patch b/sys-libs/libnih/files/libnih-1.0.3-pkg-config.patch new file mode 100644 index 000000000000..979e363f2157 --- /dev/null +++ b/sys-libs/libnih/files/libnih-1.0.3-pkg-config.patch @@ -0,0 +1,56 @@ +# Bazaar merge directive format 2 (Bazaar 0.90) +# revision_id: vapier@gentoo.org-20111019170935-fheqs03szv6mhh3o +# target_branch: http://bazaar.launchpad.net/~scott/libnih/trunk/ +# testament_sha1: 84b368e08fdd9f8276611cdfe97d34f51cd90598 +# timestamp: 2011-10-19 13:13:52 -0400 +# base_revision_id: scott@netsplit.com-20110901184103-d2xbvc5hbt0vqxf0 +# +# Begin patch +=== modified file 'nih-dbus/Makefile.am' +--- nih-dbus/Makefile.am 2009-11-21 21:44:23 +0000 ++++ nih-dbus/Makefile.am 2011-10-19 17:09:35 +0000 +@@ -49,7 +49,7 @@ + test_dbus.h + + +-pkgconfigdir = $(prefix)/lib/pkgconfig ++pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libnih-dbus.pc + + + +=== modified file 'nih/Makefile.am' +--- nih/Makefile.am 2009-11-21 21:44:23 +0000 ++++ nih/Makefile.am 2011-10-19 17:09:35 +0000 +@@ -71,7 +71,7 @@ + test_hash.h + + +-pkgconfigdir = $(prefix)/lib/pkgconfig ++pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libnih.pc + + + +# Begin bundle +IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWerAspcAAhZfgAAQVGf/93Mi +DAC/7//wUASW8VttRtyKRaUhJU00ZTUab1GBT9JpNNqeiAADEEpDUwp5Gk9KeiZAANAAABIo0hE9 +GTTJJ5AMo8oB6IwmmMNDQAAAaAAAAAEkgQBGTCGmmoZQPSIxoCJYV1m4Z59VmltTEiVlNBLfEBWL +DPUvZdcke3iHe+YuVhuGNtnl+0Xxmwcuy+RkTlRw9Ct83uYaZ7PH3vOd/AqYc6mhoKnwOCJD7ej5 +jS/rj7FmeOwxohzIMw9Ftarf11sHFhfFyWQEWL15gMctp9IL8d5sOYp0YoMOIw5htiyuYikcaPZ+ +xeB0ZI+IpppnCWQD3qlFKeI1NHACFmRBrQ2Sn1nmVurFZLNeqWK2Xy7eKAJK1SuguZhs8DekVjKE +YGJwURdteHklA3WkfNMdKKNMQHQqnTtxAg1ShnXAzzkjnDtTSCwNhnuoY0WM1bLLCJlFM6NphCLS +CGV+ZxUbN6YirSh9tVJWBzJKQaE5HEstAsAuqdVKlAlNKIrkYPSb3oy9WkKNsyyLYUiplUvi8C3i +ioz+SscYWhwHzkxL/k0TPk8tL6l5FzzBa8FCKRWbDCTa0nbGzEhoJmaYEfwBog+pmXpsuVNUZmF4 +OreOMqF7JyNA1HJJ14+yxa6SRpJ51jBFyaNAojQK2ai7BtxEVZFoG3TYZiaTnR8LwZPDCtw7GqpA +6mKFWiqtj/KxW+zQNmQbh9XE5eCCdFBTQzJmb7H3fDQpKW1njIoLHI+HeAXGDxYmu7HJ3DoZtH3Z +7UfYYlEO8WoZpHZIMdDSCTWUE41kdp0nBWlshTuqcODflplwgnc03YlpZF9eBKQsUJi4gRvOhwmO +XzuHW8qzc+JojHueBjZGJRiZQktKmJFoSD3k4+SOEue4uOh88jC0uRC8zDtbDCuz1fd6m5nsBrXh +4KCGR5mWo4953Ie6CdWVops43mZdcboGGpUVirZZC+SPwwvwVSDuTAzASyFMevBBdbmdy3y0L0Y2 +oqRD3LY5+RqPM9R4/XEkdVuXmAxvF7GgrzRSIuDsTD2MANhmBxuF+EEbTKN/ciAzAUxnOdie1hol +lqAkHxA44ja0WMKzYlmGU28kSdqB1i6h4nLevOVCnK+WtEKLpuOy6eZFThX5IsRrjenja/BSN2iu +FFE+cHoYwJzGRI9yFKvpRUQ+H0qqaIoI5lP18lEqsPiBhRHMkpPIHqMuoiGiZyQxSXC0ynqSTYNX +80VoGbTVLspApI9vo8XZBOScj6oHLR6qkjlnhkwwNQ8/wZdSfNBI0NSKLNasgKl6LF7FVbx4MCcj +jYREWWzVEEVd81rloiAfu+h8H33/8DPhciqmx3QHdcdLEOKQ1mHIp8NQLYDAhQjJPmRA4hvGfSG+ +dwTBj1rKUFKGB7BYiKJ+C3dZ91NewHQ8kxHGlS0rSLioLvwrlwNSrRgtyZzWVFTWB8C7kinChIdW +BZS4 diff --git a/sys-libs/libnih/libnih-1.0.3.ebuild b/sys-libs/libnih/libnih-1.0.3.ebuild new file mode 100644 index 000000000000..934331c7a09a --- /dev/null +++ b/sys-libs/libnih/libnih-1.0.3.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libnih/libnih-1.0.3.ebuild,v 1.1 2011/10/19 17:27:02 vapier Exp $ + +EAPI="2" + +inherit versionator eutils autotools + +DESCRIPTION="Light-weight 'standard library' of C functions" +HOMEPAGE="https://launchpad.net/libnih" +SRC_URI="http://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="dbus nls static-libs test +threads" + +RDEPEND="dbus? ( dev-libs/expat >=sys-apps/dbus-1.2.16 )" +DEPEND="${RDEPEND} + sys-devel/gettext + dev-util/pkgconfig + test? ( dev-util/valgrind )" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.0.3-optional-dbus.patch + epatch "${FILESDIR}"/${PN}-1.0.3-pkg-config.patch + eautoreconf +} + +src_configure() { + econf \ + $(use_with dbus) \ + $(use_enable nls) \ + $(use_enable static-libs static) \ + $(use_enable threads) \ + $(use_enable threads threading) +} + +src_install() { + emake DESTDIR="${D}" install || die + + # we need to be in / because upstart needs libnih + gen_usr_ldscript -a nih nih-dbus + use static-libs || rm "${D}"/usr/lib*/*.la + + dodoc AUTHORS ChangeLog HACKING NEWS README TODO +} diff --git a/sys-libs/libnih/metadata.xml b/sys-libs/libnih/metadata.xml new file mode 100644 index 000000000000..7940d76a783f --- /dev/null +++ b/sys-libs/libnih/metadata.xml @@ -0,0 +1,8 @@ + + + + + vapier@gentoo.org + feel free to update however you like + +