From 8a0e6e72a438c6a3fa3112e9f920f9f5a8524009 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Fri, 3 Apr 2015 13:11:36 +0000 Subject: [PATCH] Streamline autotools-utils.eclass usage; add missing SLOT operator Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- sci-libs/bliss/ChangeLog | 3 +++ sci-libs/bliss/Manifest | 28 ++++++++++++++++++++-------- sci-libs/bliss/bliss-0.72.ebuild | 19 ++++++++++--------- sci-libs/bliss/metadata.xml | 18 +++++++++--------- 4 files changed, 42 insertions(+), 26 deletions(-) diff --git a/sci-libs/bliss/ChangeLog b/sci-libs/bliss/ChangeLog index 7041e058785b..f0aef97f10ed 100644 --- a/sci-libs/bliss/ChangeLog +++ b/sci-libs/bliss/ChangeLog @@ -1,4 +1,7 @@ + 03 Apr 2015; Justin Lecher bliss-0.72.ebuild, metadata.xml: + Streamline autotools-utils.eclass usage; add missing SLOT operator + 11 Jul 2013; Christoph Junghans files/bliss-0.72-autotools.patch: install heads into a bliss subdir diff --git a/sci-libs/bliss/Manifest b/sci-libs/bliss/Manifest index 23c776456983..9df45fa9cd84 100644 --- a/sci-libs/bliss/Manifest +++ b/sci-libs/bliss/Manifest @@ -1,16 +1,28 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX bliss-0.72-autotools.patch 4355 SHA256 5813b72e6879349c4c2009a81345c58ffc3a29c2b04e47d20e00085eb8166701 SHA512 50c5dc906e3aa83a628d9ca0cad6d5fcfd38d5bd422349dcba6c1af79f6561c5d9a9d2deb705a47dca40db4f7ee266a5a0f637c4eee020f0a143e60404f25de2 WHIRLPOOL ac579d6d9e8ceafd4f2d0bccc1500129923513c45391ccef7c4850c5b64e13f84de81736cabf0e2f7a5029bd515380024d294b9ba9b12bdc6e6d56feb77ddc21 AUX bliss-0.72-fedora.patch 17789 SHA256 a8aaa3da7afef064c437cc309ab3e1c4bd31090b0aa8493f7f3d961db83fa3f5 SHA512 8313f07b1b50abd8cb45e4cd0a84d6f9971967ca2f46520f53c41db6fb4141c3d07ba4b913bffa0a7cad9b9fd8f63de843bb0836c71c52c08af233032f54e0b8 WHIRLPOOL 29b879afd0015d91a72256cc25bd71749607bca8176fb671ada06f24bbb5d09cf23bf08e6c6cba10b793c095181da63fe0c74ac8849ffeb96c55dd346f113ba2 DIST bliss-0.72.zip 90970 SHA256 528d192b1e30722fc60f5f12c9d6c12b374d838198ae7f18fb41bedabf735ed3 SHA512 a09b3cea26e3ff5f5733f10bfaadaf6fb5a3f443e1cc306fad16af2f7b4cd97c90652315f911a324d6d71426a3d098cd5c7e5721f69c599fe2e0d6d34caa0ef5 WHIRLPOOL afbc41c04e843d383a2da8d5e26ec2882c847e8e5f1e71c05f884396fcc79eab764df628523336b88e0c6ef4fbf073a52870e2c68ded428002d9391894cb53d6 -EBUILD bliss-0.72.ebuild 989 SHA256 a6ea56b442f5e8c97ae45887a596e2e16f3b694d2272d5f3de0e303055172128 SHA512 e751cd76dd007e3a27575a3f4e8132592cb94c1cecf6d9863fec5c9f48da38248ac8146638dfa9ae030550f78a7c1584a10002286351ad43e567cd109e9e1f1e WHIRLPOOL 4d2c765641cbbf7a082cb59efabdec6aa0ba0be9bece8499a75716cb44ab422151e51071126a807af1a74681d32255eacaf51f539e69170952e3af5f6887acb9 -MISC ChangeLog 452 SHA256 c747befd39738afea11be1d379dabbdf68971f18961d60e68b2d2331cd11935b SHA512 60f78abc0283ad65a1ddabc78dcabf045a971374bce371a3b83a49b4f5cf5c4dd87a9a2e1c94fc7ac5f133cb40c92494a1ee2868a6ac893ed41117f1e0d173c3 WHIRLPOOL 56d9152e36cb8921563171a1bf67494154b56f9736c260feee20d2532f5e5642d5b198b0b09688b8a6f689ee48234193dcc5798f71bbe3dff987f96af3d923b1 -MISC metadata.xml 346 SHA256 12dc49f702d2db5c76ebcc6e6f98b23619bd0d1dde617290da271f3f833dd117 SHA512 2b5a1e98febf6014111d3a0e6ecadd46ee52db3df3012bc68c4d4d1bee108ff4bcdaea320fb3c7c5687e204e144783a06ed84afc242552781edba0bdf8c79c82 WHIRLPOOL 67783b9bfa4b372daf19a1c22bacaa6ea908e843a8b00ee337ed7367c2f7c26a1fd8365bfb76528e4a3b9ae48925359c5561fcdb779d0c59ab6c7304baa73c7f +EBUILD bliss-0.72.ebuild 1040 SHA256 a413cf013e4f5aeb6e4d22c22625b6ab4fbc4238562ba87b7d98a30a3bd09813 SHA512 785f050b06d14a9fa5d31546f74b0457820f75fbd2e82e55a6f560cb97c955eb50ea214d154bb362167430108fde3cc73443f455f6cebab356e4e4ab4fb33d96 WHIRLPOOL 6400ff037ba77835fac3773eaabe3b4eb8864b077632f14192217d79bf751bdee3f2be1d3e8492652d2c07da5b6c580608c4a42b247167f472eb93bf05da6cd7 +MISC ChangeLog 602 SHA256 faa76a783fffa957ce5d4c4fd90ecfd0039c2d06bfdfa28880cec3a0dec2f53f SHA512 16273c662bb222dc3552ab46b60d183a7eb9dcbd3f64394fb1c87d9f5f2893aa1f3b9cb7706d963bcf65db7f0f2bdf3fdc0fc97f021b4913b7d1c6265dbf3f33 WHIRLPOOL 1c141e7285d68a73b1be8754326bd61eff955f05b1226dcb6a8f9da5eb8e0c422a33d5c9356f9d66ece316bf11c96446c40f90ee0618203600cede69b2e92462 +MISC metadata.xml 359 SHA256 2d1c9ac0cd13cdc8863fb78e3e86eae6be6f1dd08b13c88527187e001b2d189e SHA512 732d74f231f1aff8b2064a86232b84fd2efcdd2136158f00f4ea2903821f2ac2a34fbd68243d829bfd722562c2161f415a3743d07096f4926d45fb8e6433d83d WHIRLPOOL db230809423cfac8176be3c9441c2ab1ba960e68f6456ae7a5af2a9bcc992817e1d68f03163a6766faa795d63357278bfd8c45e9cfde4fa7dd853a26ed276189 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iF4EAREIAAYFAlT9l70ACgkQid6yGVZcMrx9dgD/V4mlJjG1plNCYSKgJViZkJCF -QOHqT/Iapib41eZC30sBAIaSHzu8RYexrp85P8ibYwa+We0Rto9VKwuEz1eTcbge -=CYay +iQJ8BAEBCgBmBQJVHpGIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirtXwP/0gyBXJkMQDvyuKavyv/ZQ1P +SgYpTxUT24lAxU+/r+6wMU6cqtqVNEbxpyErJTy4kBLB6ZfPvdBLQgktxOB1TS4h +4noVDruQHw8LcK5gEFKMXckU3DnRhXWypop5DCA2K82rjcV1BYZS2nLZ/fdXzOkL +dU7eQlw8BDccGnu92JfcLoGJlR64CbK5/MNrS0++MqV4eqXXrD3AgZkCMcswP9Zu +6X9Ns0hbBI+lSJaxltewU/Wg5HGR/0H7dtMpNIXRrwIbZGAMC3zR0kZV6B/87Wxa +eoPC3UZN25VNSF8q2G/MrjR1f37Ag/LjwevW/5RTcN5+A0BgtVgRwx/KretEZ3nV +P4/pd0VhhyPqC7i6dKXCFO3QO9Z0g5FLFkpycyh/q4xOr7xEwhhEuHJ0ToNwnXJc +yb9E6idvYc6dU/jdI2TrH6kU6BIaZBOToJBpZOYncbSNoloKRa6Tnw6F4W0POzvV +1qX4rjwNFVlV3396eMI9SEfcmwliSR+CclsARRHXxrxnWfrj3v3jbDuHC7DHv6C/ +S2QpmsO5NgDOUSG+ipp00tSfttkgv/YkemOsvv8znB5P7KvquenzMDZpRKOo/0t0 +LhnRVapr8CKdi3+pZcvrUTEDqCsdNRv5jmjjac5biBAFhfb+3ku75WKhrjv9USEL +nEdO85ql9YncsQfm3l9x +=Mrez -----END PGP SIGNATURE----- diff --git a/sci-libs/bliss/bliss-0.72.ebuild b/sci-libs/bliss/bliss-0.72.ebuild index 5c2d35c2735a..66f4bc220cd2 100644 --- a/sci-libs/bliss/bliss-0.72.ebuild +++ b/sci-libs/bliss/bliss-0.72.ebuild @@ -1,9 +1,11 @@ -# 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/sci-libs/bliss/bliss-0.72.ebuild,v 1.1 2015/03/09 12:51:38 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/bliss/bliss-0.72.ebuild,v 1.2 2015/04/03 13:11:35 jlec Exp $ EAPI=5 +AUTOTOOLS_AUTORECONF=1 + inherit autotools-utils SRC_URI="http://www.tcs.hut.fi/Software/${PN}/${P}.zip" @@ -15,12 +17,11 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc gmp static-libs" -RDEPEND="gmp? ( dev-libs/gmp )" +RDEPEND="gmp? ( dev-libs/gmp:0= )" DEPEND="${RDEPEND} doc? ( app-doc/doxygen )" -AUTOTOOLS_AUTORECONF=1 AUTOTOOLS_PRUNE_LIBTOOL_FILES="all" #comes with pkg-config file PATCHES=( @@ -33,11 +34,11 @@ src_configure() { autotools-utils_src_configure } +src_compile() { + autotools-utils_src_compile all $(usex doc html "") +} + src_install() { + use doc && HTML_DOCS=( "${BUILD_DIR}"/html/. ) autotools-utils_src_install - if use doc; then - cd "${BUILD_DIR}" - emake html - dohtml -r html - fi } diff --git a/sci-libs/bliss/metadata.xml b/sci-libs/bliss/metadata.xml index a86587f981d2..64784b089c3f 100644 --- a/sci-libs/bliss/metadata.xml +++ b/sci-libs/bliss/metadata.xml @@ -1,13 +1,13 @@ - sci - - ottxor@gentoo.org - Christoph Junghans - - - tomka@gentoo.org - Thomas Kahle - + sci + + ottxor@gentoo.org + Christoph Junghans + + + tomka@gentoo.org + Thomas Kahle + -- 2.26.2