projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 322c739)
Fix bug #160197 by converting configure calls to econf. Also clean up a
authorRyan Hill <rhill@gentoo.org>
Sat, 6 Jan 2007 02:11:30 +0000 (02:11 +0000)
committerRyan Hill <rhill@gentoo.org>
Sat, 6 Jan 2007 02:11:30 +0000 (02:11 +0000)
little.
Package-Manager: portage-2.1.2_rc4-r6

x11-libs/wxGTK/ChangeLog patch | blob | history
x11-libs/wxGTK/Manifest patch | blob | history
x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild patch | blob | history
x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild patch | blob | history

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 9b6681e2e4e2dd78d77579d355261b0b9be5437f..f26c8703240f62fabcb928fc691db079e49dc065 100644 (file)
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.133 2007/01/05 22:50:01 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.134 2007/01/06 02:11:30 dirtyepic Exp $
+
+  06 Jan 2007; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.4.2-r4.ebuild,
+  wxGTK-2.6.2-r1.ebuild:
+  Fix bug #160197 by converting configure calls to econf. Also clean up a
+  little.
 
   05 Jan 2007; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.4.2-r4.ebuild,
   wxGTK-2.6.2-r1.ebuild, wxGTK-2.6.3.3.ebuild:
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 06858bc80bd2b583c1adbba6bf943f7ec4a88345..dfab1803604d5ada0c46a0e4153aeb68e8bd2e37 100644 (file)
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -51,22 +51,22 @@ DIST wxPython-src-2.6.3.3.tar.bz2 18963104 RMD160 7feacff6808574143590a0a421ee60
 DIST wxWidgets-2.6.2-HTML.tar.gz 1440455 RMD160 6ad8767efcc2d0881ce202e333d9f0f5b393866a SHA1 8f9e34d31dcb8bcd095160b65262822993de4ce7 SHA256 eeb47240ccc56a8eb14d09153e1cfaa9ad9c3f71ea67b21ac62790e59c405312
 DIST wxWidgets-2.6.2.tar.bz2 13060077 RMD160 bcbf4adbc5dab79643eeb036f94b18e24ee76217 SHA1 e77217138fa3da91c1cfd058ae6c3173def226dc SHA256 e6edc7fbf3523290d6f08767a00979785205227e7bf634eeeb6393e65bb4abd6
 DIST wxWidgets-2.6.3-HTML.tar.gz 1349870 RMD160 3be20dce033c3e14999783a959fe0804fcab3d91 SHA1 915f21d4cd2bb53403317f5b9514972111b72bdf SHA256 d564729b6e862c751dcea2487137832f9fbf95a665481c50d029fba9d4dd9cc1
-EBUILD wxGTK-2.4.2-r4.ebuild 5034 RMD160 1bcda2c40b91d09710d529ab71bd846db35409a4 SHA1 80f76ef80827bd5761987792ab5bf2c477ec180f SHA256 0e2570a1c6ff5c48c9f5b2b41dc8fe34263c4b6bc36096131c80fbcbdebcf6f9
-MD5 015de085e6afc6c5914b1d7a3a057220 wxGTK-2.4.2-r4.ebuild 5034
-RMD160 1bcda2c40b91d09710d529ab71bd846db35409a4 wxGTK-2.4.2-r4.ebuild 5034
-SHA256 0e2570a1c6ff5c48c9f5b2b41dc8fe34263c4b6bc36096131c80fbcbdebcf6f9 wxGTK-2.4.2-r4.ebuild 5034
-EBUILD wxGTK-2.6.2-r1.ebuild 1579 RMD160 b0264910bec9713e55e048c7690a092daae54243 SHA1 c123f1982ae36b515ff471f63e38fd3e9b55e662 SHA256 ac43ba152bbd2c171aecbe10b9682b2ce61d983c8fcccdf02dbfbc77ba844b9e
-MD5 819b5a78fa408f9f3f9a349d0809cf56 wxGTK-2.6.2-r1.ebuild 1579
-RMD160 b0264910bec9713e55e048c7690a092daae54243 wxGTK-2.6.2-r1.ebuild 1579
-SHA256 ac43ba152bbd2c171aecbe10b9682b2ce61d983c8fcccdf02dbfbc77ba844b9e wxGTK-2.6.2-r1.ebuild 1579
+EBUILD wxGTK-2.4.2-r4.ebuild 4747 RMD160 c415b7b3055e285d46df68125602f2b4fa408cea SHA1 a0934c54e18b34fc9b3d5e6da569d6811c323723 SHA256 d04b8e68d54ce315f021d29305d7b83f46a6ff7a3b1e6e33dcd195c260814f2e
+MD5 a6fb1cee4309cab9a6fc15cee1a5592a wxGTK-2.4.2-r4.ebuild 4747
+RMD160 c415b7b3055e285d46df68125602f2b4fa408cea wxGTK-2.4.2-r4.ebuild 4747
+SHA256 d04b8e68d54ce315f021d29305d7b83f46a6ff7a3b1e6e33dcd195c260814f2e wxGTK-2.4.2-r4.ebuild 4747
+EBUILD wxGTK-2.6.2-r1.ebuild 1551 RMD160 b69349824933f88d4a65a4f3d5c725bec91712da SHA1 38a633a4f800b527eb12791456a7c1ced7f03dbc SHA256 b65c4bb2ec1806f180f35f2f95e0fc3bd3ea1cb52e32ad80a28ce9484bfa5da4
+MD5 4b2c6d187d184dc0a5cfc2814fe03b45 wxGTK-2.6.2-r1.ebuild 1551
+RMD160 b69349824933f88d4a65a4f3d5c725bec91712da wxGTK-2.6.2-r1.ebuild 1551
+SHA256 b65c4bb2ec1806f180f35f2f95e0fc3bd3ea1cb52e32ad80a28ce9484bfa5da4 wxGTK-2.6.2-r1.ebuild 1551
 EBUILD wxGTK-2.6.3.3.ebuild 5093 RMD160 4bd1fd9c7e1ee88882ff018b22582e468a0649bd SHA1 23a6e13dcf21d8a85b3f5549d8dfff1fe1849923 SHA256 b3961312eb68bd7e8cce7896fded7901893a7230212cd4d286145619be3431f1
 MD5 30ccfceaa66e4c756978a7494c0f3760 wxGTK-2.6.3.3.ebuild 5093
 RMD160 4bd1fd9c7e1ee88882ff018b22582e468a0649bd wxGTK-2.6.3.3.ebuild 5093
 SHA256 b3961312eb68bd7e8cce7896fded7901893a7230212cd4d286145619be3431f1 wxGTK-2.6.3.3.ebuild 5093
-MISC ChangeLog 20809 RMD160 411a2e595dbf79d97c12c538665e46e07b4203d5 SHA1 e0f419a97d93e753372d6d95cf313a5e0cbea0af SHA256 d48ceded263f55ed492fa805a86490874d84a815dd9e0ca2cfa627e33b23860b
-MD5 7f00d4a6011e940260941f88be91d1dc ChangeLog 20809
-RMD160 411a2e595dbf79d97c12c538665e46e07b4203d5 ChangeLog 20809
-SHA256 d48ceded263f55ed492fa805a86490874d84a815dd9e0ca2cfa627e33b23860b ChangeLog 20809
+MISC ChangeLog 20990 RMD160 ecb0171251dbdc78db8ee59308033995601125f2 SHA1 17364fdb13954652b467ebc007dcb15881143095 SHA256 f35fb05979f8267728bf8db279f3b8045dc8226d7d504721fdccb16703444aca
+MD5 191bb51263596c47e04bc4a160e3e5f4 ChangeLog 20990
+RMD160 ecb0171251dbdc78db8ee59308033995601125f2 ChangeLog 20990
+SHA256 f35fb05979f8267728bf8db279f3b8045dc8226d7d504721fdccb16703444aca ChangeLog 20990
 MISC metadata.xml 162 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 SHA1 04e3121e3f51426fec226bfdfc9df29349b754b6 SHA256 4fa9b642f4f36552d79a4d9fe18252c123d38c359f64f2f2709df866084a4b4e
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 metadata.xml 162
diff --git a/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild
index 3160802a5952789f6fc6048ce90fc7cbe931a028..a8a2cf6f89631ff4c81b27750ef5139aad4bda31 100644 (file)
--- a/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild,v 1.9 2007/01/05 22:50:01 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild,v 1.10 2007/01/06 02:11:30 dirtyepic Exp $
 
-inherit flag-o-matic eutils gnuconfig multilib toolchain-funcs
+inherit flag-o-matic eutils multilib toolchain-funcs
 
 DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
 HOMEPAGE="http://www.wxwidgets.org/"
@@ -50,8 +50,6 @@ src_unpack() {
        if has_version '>=media-libs/freetype-2.2.1'; then
                epatch ${FILESDIR}/${PN}-2.4.2-noftinternals.patch
        fi
-
-       gnuconfig_update
 }
 
 pkg_setup() {
@@ -80,20 +78,18 @@ src_compile() {
        myconf="${myconf} --with-gtk"
        myconf="${myconf} `use_enable debug`"
        myconf="${myconf} --libdir=/usr/$(get_libdir)"
+       myconf="${myconf} `use_with odbc`"
 
        if use wxgtk1 ; then
                mkdir build_gtk
                elog "Building gtk version"
                cd build_gtk
-               ../configure ${myconf} `use_with odbc`\
-                       --host=${CHOST} \
-                       --prefix=/usr \
-                       --infodir=/usr/share/info \
-                       --mandir=/usr/share/man || die "./configure failed"
-               emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk failed"
+               ECONF_SOURCE=".." econf ${myconf} || die "econf gtk1 failed"
+               emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "emake gtk1 failed"
                cd contrib/src
-               emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk contrib failed"
+               emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "emake gtk1 contrib failed"
        fi
+
        cd ${S}
 
        if use gtk ; then
@@ -101,14 +97,10 @@ src_compile() {
                elog "Building gtk2 version"
                mkdir build_gtk2
                cd build_gtk2
-               ../configure ${myconf} `use_with odbc` \
-                       --host=${CHOST} \
-                       --prefix=/usr \
-                       --infodir=/usr/share/info \
-                       --mandir=/usr/share/man || die "./configure failed"
-               emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk2 failed"
+               ECONF_SOURCE=".." econf ${myconf} || die "econf gtk2 failed"
+               emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "emake gtk2 failed"
                cd contrib/src
-               emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk2 contrib failed"
+               emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "emake gtk2 contrib failed"
 
                cd ${S}
 
@@ -117,16 +109,10 @@ src_compile() {
                        elog "Building unicode version"
                        mkdir build_unicode
                        cd build_unicode
-                       ../configure ${myconf} \
-                               --host=${CHOST} \
-                               --prefix=/usr \
-                               --infodir=/usr/share/info \
-                               --mandir=/usr/share/man || die "./configure failed"
-
-                       emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make unicode failed"
-
+                       ECONF_SOURCE=".." econf ${myconf} || die "econf unicode failed"
+                       emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "emake unicode failed"
                        cd contrib/src
-                       emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make unicode contrib failed"
+                       emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "emake unicode contrib failed"
                fi
        fi
 }
diff --git a/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild
index 20841f3f374a53d5039dd3edb213233c762f8d1e..787a7a1fa12f894109b651f746cf4d10ee95ab86 100644 (file)
--- a/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild,v 1.13 2007/01/05 22:50:01 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild,v 1.14 2007/01/06 02:11:30 dirtyepic Exp $
 
-inherit wxlib gnuconfig
+inherit wxlib
 
 DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit and
 wxbase non-gui library"
@@ -38,7 +38,6 @@ src_unpack() {
 }
 
 src_compile() {
-       gnuconfig_update
        myconf="${myconf}
                --with-png
                --with-jpeg
Unnamed repository; edit this file 'description' to name the repository.