diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-05-28 07:40:15 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-05-28 07:40:15 +0000 |
| commit | 1ebb42aea0a4ee9fe167cb23dfb5e3149f7d3747 (patch) | |
| tree | bb12974d54bad66e3486a314577528d67baf321b /sci-geosciences | |
| parent | autotools.eclass no longer supports re-inheriting so we need to override AUTO... (diff) | |
| download | historical-1ebb42aea0a4ee9fe167cb23dfb5e3149f7d3747.tar.gz historical-1ebb42aea0a4ee9fe167cb23dfb5e3149f7d3747.tar.bz2 historical-1ebb42aea0a4ee9fe167cb23dfb5e3149f7d3747.zip | |
Fix wxwidgets handling, thanks to papillon81
Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/grass/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-geosciences/grass/Manifest | 30 | ||||
| -rw-r--r-- | sci-geosciences/grass/grass-6.4.2.ebuild | 38 |
3 files changed, 39 insertions, 34 deletions
diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog index 91eb5e99f139..357d5beb8fd4 100644 --- a/sci-geosciences/grass/ChangeLog +++ b/sci-geosciences/grass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-geosciences/grass # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.114 2012/05/24 19:33:27 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.115 2012/05/28 07:40:15 scarabeus Exp $ + + 28 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> grass-6.4.2.ebuild: + Fix wxwidgets handling, thanks to papillon81 24 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> grass-6.4.2.ebuild: Whitespace to shutup repoman. diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index 48b74790e835..4837cd593f8a 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -10,23 +10,23 @@ AUX grass-pkgconf.patch 1322 RMD160 7b48d8e05a07090d8d36d2fb96b385f2d655e066 SHA DIST grass-6.4.1.tar.gz 23608488 RMD160 2a9ee5da891c9d89a5ad0e66f914d2dd763e5128 SHA1 ea1cdfd1b7422367d671eeaf66f362d694a94abd SHA256 8b886faf8635f77f0d1626806454e6e8bdfa9155e3c10a0bc3e10447b9e6bd03 DIST grass-6.4.2.tar.gz 24097202 RMD160 2a8a2a63edf8e1cc53b7b26975087eef59c9a397 SHA1 74481611573677d90ae0cd446c04a3895e232004 SHA256 670bb74d3000ea0932b7e988d3080d0c629f9eb22a8479bb2987ded473f7b4ca EBUILD grass-6.4.1-r1.ebuild 8073 RMD160 e8dacca94199c65f5384bdb76295a8c5cf662cf1 SHA1 842276f7ce638562524add5524df06e660a25af6 SHA256 c280b66ecf99d4db135336edeb29e5ec4e580b48c14ee018247670100df5ff9c -EBUILD grass-6.4.2.ebuild 7556 RMD160 e5619cfbede08221f0e7905291fa27dd996b2ac7 SHA1 b349466fff59758fe162e526694b27d5361e6111 SHA256 68895101869f2f08e34a0c644eff8d2221084031e625af3583b416ebb2bfdf04 -MISC ChangeLog 21961 RMD160 a9b8dbce59c1d379a9df3347a23387142c1869fb SHA1 9e29668ef795e54e888e7b4488adc8aec5996a4c SHA256 13f72bb1c92a314681bf9075e7b717e42f8537d58011c8a3b5a0b9bb7332f805 +EBUILD grass-6.4.2.ebuild 7614 RMD160 f8ab2f86ac7a23415324c840d1242e28610b23d0 SHA1 cad28f10107b95e2f9bb7121cd5cb9f5e1fa0183 SHA256 85e446a45544687352442ea97f232e3deb2c32cbb4ed1e0ac102c87380e4bb92 +MISC ChangeLog 22084 RMD160 c87686cf641470b2c9b3499e32f0056d45cf6ffb SHA1 d9d221d9ef70d56d3e1ce161a6d795bd0ce2b360 SHA256 41e0f8ec64b6b02129e6cdd048585fe0ab21b8c1c812a90d48f81fb60361ad8e MISC metadata.xml 629 RMD160 69f5617b3320877ac6089e4f48b753da437e2458 SHA1 0b8d802fbe536bff533c76b591e0ec3accfe9dd1 SHA256 e6307680fa4020225e1dd8769ead3e2d20452f87d80d2467b52849c50c2d765b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBAgAGBQJPvo0OAAoJEOSiRoyO7jvoDOcP/j7OaioCPCpx8hSW+qZCC08s -NtCqthSl3rmrNEaVtWDMSTNlZMvigXdClEm8DslFZDCCU4t0KORBNFVonen56z6H -kVVbRKOFaHo30XfIvcZDw1QP0HVrj7CzZJ3LlyX6lIF40A4NXNT/5BTP0hB4sCr3 -V2ltAu9CPGCyDjdpHHog+Bov6IaJx8DKGyvWyi69SX0Vw738J6Qb0WlNDdb/P6gE -uMhPg/rQ8xxgr+j6Zhfryc8FrqIgm2T0/khCe/n3oCR+h9u+CBrI1o/Hf2IBUjbK -+pjyuN7E5jhPQb4/9oF8ALb6sobhiKBybO0EMrGWvUS+DeZwerECm0i2TOGcPk02 -EuZZTDIavMerWVs2lo67zJlDmvn4pgRRUlrOoNx4rT6fQ4tGWRBEPPcd7lglUOQq -X+0P1ptevgpyKGIJj9YNjvJiAkmqVGeQFDkpSur0wcLJAfrQOeVyh1PeulYvrK73 -/0oIx3mXswKMdA1EAOQlPd2rmU1qeHSjvsIjR2rjlLlqTD7LffaIYyAoBF4dB6Zm -Z5yScuBCddo4tkveOMoVPjY8lM6O1fnS5tMQhJt3AuwR0aaatmmGHv01JhyvxUWq -IZ1MDoMnZB8E+h+Sc5O6kMwzX4Cx14uszgQrYzKzteJ8yf2Ofw1ebJkX1yDYTAl5 -u6xW8oUU91jbbxMM/oNJ -=Lf6U +iQIcBAEBAgAGBQJPwywcAAoJEOSiRoyO7jvotIkP/2cB4ZJ/rda8nIvfqLC8xhsO +wYdOgEzpOXc6+qUA6Rppi1Ij9nsOnaYuvNAEAryvZ0zXT5/Ue6VJb7tnIwfOEYWe +BGwhV7nUEL5QewsRC1ry5L69kHcv95oJrc0aoz+8AUAv0vPlmGrNCCjK2hF6BvO4 +9q6B4lS3fax6+ncyI+iTpi31sCbWsFvhjmRxjU22XDBoH5NBlc1JpGDTaAP8x7zb +72Ixf4vOSZvrAPwKIVnAtLIGUcjMylFgoktxaNy6/OfjZ5tkK7qglVDdmjOzl2Bk +1cT1SYIFoG3vP6Bx+37sZ0NCa8yfQI/fB53kgHKH8Ux2I5Lft7sIRnTbFtu2Ynsn +gHID8wgOakki4EVrogyfF2zf1kxfMsTd29+k5oZ4WPINqOoKsmyD293vWK4notKe +YScD2C8XJ/7t2Ys2qmK3/vCzRNXO6E4qNkBD8uJwfY3OyqWD+Y55+1UeLXHGc+SK +iMU3Gk0bQts4WFIy+FcmqaJhcc0Qgyy46Ad5Ya5fpJXMVsxYH6YJyTQKihiY31bI +uqs0AHKQ5LGXQLsVy1RqRotQHXdtJ/CRhXOnasM1LNbgglT0hLo0SDvQg/818BY3 +ZvaBKi/lKoDe3ic1qNLPkMI80qtu31wbDUSHhBTpW2roaldr1Fy3BRKPm0a3upru +xjRefrvq31DNSK0skd2C +=VHWZ -----END PGP SIGNATURE----- diff --git a/sci-geosciences/grass/grass-6.4.2.ebuild b/sci-geosciences/grass/grass-6.4.2.ebuild index 1b7d6e285395..c88551b7902c 100644 --- a/sci-geosciences/grass/grass-6.4.2.ebuild +++ b/sci-geosciences/grass/grass-6.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.2.ebuild,v 1.2 2012/05/24 19:33:27 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.2.ebuild,v 1.3 2012/05/28 07:40:15 scarabeus Exp $ EAPI=4 @@ -147,28 +147,30 @@ src_configure() { use opengl && myconf+=" --with-tcltk" use motif && use opengl && myconf+=" --with-glw" use motif || myconf+=" --without-glw" + + if use wxwidgets; then + WX_BUILD=yes + WX_GTK_VER=2.8 + need-wxwidgets unicode + myconf+=" + --without-tcltk + --with-wxwidgets=${WX_CONFIG} + " + else + WX_BUILD=no + # use tcl gui if wxwidgets are disabled + myconf+=" + --with-tcltk + --without-wxwidgets + " + fi else myconf+=" - --without-opengl --without-glw - --without-x - " - fi - - if use wxwidgets; then - WX_BUILD=yes - WX_GTK_VER=2.8 - need-wxwidgets unicode - myconf+=" + --without-opengl --without-tcltk - --with-wxwidgets=${WX_CONFIG} - " - else - WX_BUILD=no - # use tcl gui if wxwidgets are disabled - myconf+=" - --with-tcltk --without-wxwidgets + --without-x " fi |