diff options
| author |   Johan Bergström (jbergstroem) <bugs@bergstroem.nu> | 2011-03-12 14:36:24 +0000 |
|---|---|---|
| committer | Johan Bergström (jbergstroem) <bugs@bergstroem.nu> | 2011-03-12 14:36:24 +0000 |
| commit | f19dfae92c2b3e140cbcb1042533ab32b401dc9f (patch) | |
| tree | 869f9ed5aed3d5f0a3ecc1d7912465c9103a8a4a | |
| parent | x11-misc/xneur: Add patch for libnotify-0.7 compatibility (diff) | |
| download | sunrise-f19dfae92c2b3e140cbcb1042533ab32b401dc9f.tar.gz sunrise-f19dfae92c2b3e140cbcb1042533ab32b401dc9f.tar.bz2 sunrise-f19dfae92c2b3e140cbcb1042533ab32b401dc9f.zip | |
dev-libs/jansson: Use autotools-utils instead of emake. Thanks to mgorny and Tommy[D] for reviewing and helping out
svn path=/sunrise/; revision=11810
| -rw-r--r-- | dev-libs/jansson/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/jansson/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/jansson/jansson-2.0.ebuild | 27 |
3 files changed, 14 insertions, 22 deletions
diff --git a/dev-libs/jansson/ChangeLog b/dev-libs/jansson/ChangeLog index b18158ae6..bcdf8e037 100644 --- a/dev-libs/jansson/ChangeLog +++ b/dev-libs/jansson/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 12 Mar 2011; Johan Bergström (jbergstroem) <bugs@bergstroem.nu> + jansson-2.0.ebuild: + Use autotools-utils instead of emake. Thanks to mgorny and Tommy[D] for + reviewing and helping out + 10 Mar 2011; Johan Bergström (jbergstroem) <bugs@bergstroem.nu> +jansson-2.0.ebuild, +metadata.xml: New ebuild for bug 358237. Thanks to Tommy[D] and floppym for reviewing diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest index c67399e81..1d37e9ffc 100644 --- a/dev-libs/jansson/Manifest +++ b/dev-libs/jansson/Manifest @@ -1,4 +1,4 @@ DIST jansson-2.0.tar.gz 357209 RMD160 f79520e4af9f8a47f774f9ff7ad42b1c319e186e SHA1 1368c621f453d7a44c57075bb6dcc0c484d39fcb SHA256 d8b1e764507029de0d740f177d0ce112a948491b4943a36a873d8a19be22f2e8 -EBUILD jansson-2.0.ebuild 898 RMD160 f416623d86a1ef631fa1ef17a9a51526b43b6646 SHA1 5e50a50e2b51efbbc9b5cd4668641af7e55edd0e SHA256 34473376527ea7c34b283d44029a53cba64c2f4e369c52065c78b83dfa1ee2d5 -MISC ChangeLog 297 RMD160 172bd7b541b1048e31d9a28108d2039da392488b SHA1 68cd1114f9eba0abadd292184732e95ae231753b SHA256 9c51f5cc27e6b4dc3f55c13c35f8f1d3565feee1d8d44fa1fa4a99b1c04c4e67 +EBUILD jansson-2.0.ebuild 692 RMD160 954509b2af43919a867aa69db529a9543cbf38da SHA1 d6b5bc7fbab1f4d5fbb78cb88ac19f0db5af98bb SHA256 66878ce5ae33ba256cd4fcc08bc8a80e56d0a92423f3f387a692f43488a5cc21 +MISC ChangeLog 489 RMD160 bc3474e28fd2271e8d75c245fd05cb82ef723251 SHA1 821d35c50c228a21ba417f8182b7a3b0c283e7a0 SHA256 cdd0c3f5e7a375b74cdb3eb48936b644d18e125c8e88384b5deb72c1edd3fab7 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f diff --git a/dev-libs/jansson/jansson-2.0.ebuild b/dev-libs/jansson/jansson-2.0.ebuild index e6faa3d47..6d38f2ce9 100644 --- a/dev-libs/jansson/jansson-2.0.ebuild +++ b/dev-libs/jansson/jansson-2.0.ebuild @@ -4,7 +4,7 @@ EAPI="3" -inherit eutils +inherit autotools-utils DESCRIPTION="C library for encoding, decoding and manipulating JSON data" HOMEPAGE="http://www.digip.org/jansson/" @@ -15,31 +15,18 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc static-libs" -DEPEND="doc? ( >dev-python/sphinx-1.0 )" +DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )" RDEPEND="" -src_configure() { - econf \ - $(use_enable static-libs static) -} +DOCS=(CHANGES README.rst) src_compile() { - emake || die + autotools-utils_src_compile - if use doc; then - emake html || die - fi + use doc && autotools-utils_src_compile html } src_install() { - emake DESTDIR="${D}" install || die - - # remove useless .a and .la files (only for non static compilation) - use static-libs || find "${D}" -name '*.la' -delete - - dodoc CHANGES README.rst || die - - if use doc; then - dohtml -r doc/_build/html/* || die "Installation of documentation failed" - fi + use doc && HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/doc/_build/html/") + autotools-utils_src_install } |