diff options
| author |   Nathan Phillip Brink <binki@gentoo.org> | 2011-12-30 22:42:37 +0000 |
|---|---|---|
| committer | Nathan Phillip Brink <binki@gentoo.org> | 2011-12-30 22:42:37 +0000 |
| commit | ca6361c38b64ea450e8b4934091916a84ff17133 (patch) | |
| tree | b9a957f09ec49a131eb39349efbc81451b188a3e /net-irc | |
| parent | Fix crash bug 396377 (diff) | |
| download | historical-ca6361c38b64ea450e8b4934091916a84ff17133.tar.gz historical-ca6361c38b64ea450e8b4934091916a84ff17133.tar.bz2 historical-ca6361c38b64ea450e8b4934091916a84ff17133.zip | |
Fix ./configure failure of atheme-services-7.0.0_alpha9 caused by missing PKG_PROG_PKG_CONFIG call.
Package-Manager: portage-2.2.0_alpha82-r1/cvs/Linux x86_64
Diffstat (limited to 'net-irc')
4 files changed, 50 insertions, 10 deletions
diff --git a/net-irc/atheme-services/ChangeLog b/net-irc/atheme-services/ChangeLog index f248eb821b35..d7c6d3c64b31 100644 --- a/net-irc/atheme-services/ChangeLog +++ b/net-irc/atheme-services/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-irc/atheme-services # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/ChangeLog,v 1.23 2011/12/26 14:42:27 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/ChangeLog,v 1.24 2011/12/30 22:42:37 binki Exp $ + + 30 Dec 2011; Nathan Phillip Brink <binki@gentoo.org> + atheme-services-7.0.0_alpha9.ebuild, + +files/atheme-services-7.0.0_alpha9-pkg-config.patch: + Fix ./configure failure of atheme-services-7.0.0_alpha9 caused by missing + PKG_PROG_PKG_CONFIG call. 26 Dec 2011; Markus Meier <maekke@gentoo.org> atheme-services-6.0.9.ebuild: x86 stable, bug #394385 diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest index 145794eb74ef..69537cfb5fd6 100644 --- a/net-irc/atheme-services/Manifest +++ b/net-irc/atheme-services/Manifest @@ -1,20 +1,31 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX atheme-services-6.0.8-configure-disable.patch 4067 RMD160 83b845addd7af78d10a4b8447e9ec3c88f7efa17 SHA1 a893c2fab189495b31525332a8c4c9ffdcbd3aaf SHA256 861b9b458e6e2122aca923425dec407a5d2a13fecde613544c5aafb2cb161595 +AUX atheme-services-7.0.0_alpha9-pkg-config.patch 515 RMD160 aeed772eb3f741f14b405aff145235b8ab186978 SHA1 38abf5c9ac33f5a2e25d96f191f9c2bbcbe91767 SHA256 6f43dceda07461600962e11b69d0e62e01d878f93126d98b09bfd48d2c790c7e AUX atheme-services.initd 975 RMD160 83486b35d148bab6f4b611d62fb18da63846a966 SHA1 bedd35acca25fad59ecd067709cfe85c0ba9798d SHA256 0cdcfb95d2399e132364127429618b44ce1830a61af0a5dc5bce1179b3810f75 DIST atheme-services-6.0.8.tar.bz2 860407 RMD160 31c1ba46ee5ede98108b51970bde134b259f1b3b SHA1 d201a41592fe0137e00625d7d6ed99fd79a752a7 SHA256 7dffcf8e768ca442d1fcc2b0e3031c41e34f6b3d8ee47164f84f20cb30515c24 DIST atheme-services-6.0.9.tar.bz2 858804 RMD160 57ed736bb1eaedb0db68e63266ee8c98674f0542 SHA1 1b463ec808d4b92d0047319cdc1e4223a9ca9481 SHA256 058616395d6d5477ac4e63fc1daa88dffb62c9cc5a9239dae5dbe54508b6aaf9 DIST atheme-services-7.0.0-alpha9.tar.bz2 1055265 RMD160 d86413c63c79579247904965fffa7c2b1e76d688 SHA1 28168d0b4ab36840dd3522283dca2aebbb9a56d3 SHA256 564add960be744d637573d69ee12351555696048e69505af596d767f55b0b3b6 EBUILD atheme-services-6.0.8-r2.ebuild 2703 RMD160 4a2c06940599531be1dca72f2627a1b57f68f456 SHA1 611621b6f8aadf0703ed7b298875a30a278ce42d SHA256 9613151cc34120bc9992e955464a651b8da3c68c1a9b6e0e636860faf0b0b3bd EBUILD atheme-services-6.0.9.ebuild 2706 RMD160 67c3cf7500f46a249f6727ddfe17302fde55b2b8 SHA1 ea39fd2dbc3468612a6353a56d39a923a5a4d849 SHA256 f952d0a1d14360ebf6d2a5440cf5b4589863e4293284e76fa165a0dc3257e635 -EBUILD atheme-services-7.0.0_alpha9.ebuild 2832 RMD160 99c8171c9e6c78f346c8dd6ef0fc4965c37bda49 SHA1 bdc4260fedbf21b992751865c873c8a8c80b48f9 SHA256 c00d2dd245f571f84f5c07d02759a3361f29ba6a1e65d5473a765d350c78a259 -MISC ChangeLog 5198 RMD160 558d7c1f5248efe18a992d2f7de481f91d7b10d1 SHA1 9f27ce16377e9847ccf168a0be38c561147df47a SHA256 5e0fb45f54dcc80ca8f82dec46e67d20c1bdcd54ac9f78cf2f6c2f7b7af6591a +EBUILD atheme-services-7.0.0_alpha9.ebuild 3007 RMD160 d524e8756688dc9fa3a83dbb3a21c39cf14496e6 SHA1 c594321345a4e2fbaccc954fc509b99c95720e1c SHA256 7a7f7b4f639363b742b95a1fd15e18ffbda29e535a0ea07e4ceda194444e3695 +MISC ChangeLog 5452 RMD160 5af22623543b31f4eb79527c9c6d61d8a45753b4 SHA1 f1e38533f4167aa11cf326f5d50b57c391f29410 SHA256 bd299aee06394ac1b5a4405f03f7e9ec74d65ca243f9669fdb9943196a881ff7 MISC metadata.xml 666 RMD160 6283486aa951422ac01016f439af0e4446c9827e SHA1 3b684ca6549b1a2fa8a0b788841fad944703d8d1 SHA256 1d7b369f7c9cddbc5541736c855be11aa495e1006207e32d0fbbbc99366bd9a7 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAk74iEUACgkQkKaRLQcq0GJZpQCfWeEspRCVMqlDJC94HU8GYTdH -arkAniwAZBmL8kwEZZOH8vbZ3kU1EIb0 -=33/L +iQIcBAEBCgAGBQJO/j3cAAoJEHQ6UuhrqBBQPykQAK9Wp1tyU+oDIK/jhl53Fzm3 +SppyXVIEtO6Fe2NRkJa6X46rUf+OQFPjIoWPlycGWGbtCVjw5JQbdd5y1zwquOfy +s8iVPL4MD4dzTbbcZTSVcXH4fAvF4dv2hzmYXGPdsRnV8j+XQhL426z9CD8u71T9 +90tnHDxWW49VXTymF0lL12fv6/9yWVYd4llXjETkbvcwOJBQ5oikZZ5PsJGQReQd +el9Z3Npz5NnkWgY/3k8olDha/2fHwkFr6rBhMixTSo4ZoTFBpQFZZf/YjmHEweKk +k/AXiUzs8ARCgLklpkmkJkc9v3xFLX52Pc7wgfYE/E3w6M+8joO2Hu8I8MGRyP4w +toSy2J+Q4cCWqvtnAQtQ0Uo8V9g/0KejdtaZSwz6cwqeQQNli2+yzQ5MJmDRLOL4 +lB0uj5s8QblSIyhSmOIFYz98KLle3N8bFMwAL6ceOzj9BtWc0yrYzT6Ui90bOeJK +un6mKPwULdQNQZxpnQqpx22ZN8go5CNftOVZjqDHn9Y17O+/Bbnsz7/X3uqFl0fo +O8JsGwf5PK5xYK8MOVzgOxV1D5aupjPAZFsuSfa70aD4ZXqZjUGg8NHv5OWIxxkb +dUvC0L++lO/b1jPej/ZZ2iLoVC4NYJ3px8IBFPKawSZ0tBWxsOXllzRh4/bBO+jH +TRyEb3DZ5O38G6iRQTMV +=Nm3l -----END PGP SIGNATURE----- diff --git a/net-irc/atheme-services/atheme-services-7.0.0_alpha9.ebuild b/net-irc/atheme-services/atheme-services-7.0.0_alpha9.ebuild index 1847421a0cc7..f23574fa712c 100644 --- a/net-irc/atheme-services/atheme-services-7.0.0_alpha9.ebuild +++ b/net-irc/atheme-services/atheme-services-7.0.0_alpha9.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/atheme-services-7.0.0_alpha9.ebuild,v 1.1 2011/11/08 02:47:43 binki Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/atheme-services-7.0.0_alpha9.ebuild,v 1.2 2011/12/30 22:42:37 binki Exp $ EAPI=4 -inherit flag-o-matic perl-module +inherit autotools eutils flag-o-matic perl-module MY_P=${P/_/-} @@ -45,6 +45,11 @@ pkg_setup() { } src_prepare() { + # The first PKG_CHECK_MODULES call is conditional, causing + # PKG_PROG_PKG_CONFIG expansion to fail. + epatch "${FILESDIR}"/${P}-pkg-config.patch + eautoconf + # fix docdir sed -i -e 's/\(^DOCDIR.*=.\)@DOCDIR@/\1@docdir@/' extra.mk.in || die diff --git a/net-irc/atheme-services/files/atheme-services-7.0.0_alpha9-pkg-config.patch b/net-irc/atheme-services/files/atheme-services-7.0.0_alpha9-pkg-config.patch new file mode 100644 index 000000000000..5a81d332607e --- /dev/null +++ b/net-irc/atheme-services/files/atheme-services-7.0.0_alpha9-pkg-config.patch @@ -0,0 +1,18 @@ +From: Nathan Phillip Brink <binki@gentoo.org> +Subject: Fix missing call to PKG_PROG_PKG_CONFIG caused by conditional + invokation of the first PKG_CHECK_MODULES call. + +--- a/configure.ac ++++ b/configure.ac +@@ -561,6 +561,10 @@ + [], + [with_mowgli2=no]) + ++dnl If the first PKG_CHECK_MODULES invokation is conditional, we must ++dnl manually invoke PKG_PROG_PKG_CONFIG: ++PKG_PROG_PKG_CONFIG ++ + if test "x$with_mowgli2" = "xyes"; then + PKG_CHECK_MODULES(MOWGLI, [libmowgli-2 >= 0.9.90], + [MOWGLI_SOURCE="system"], [ + |