Don't hardcode wx-config, use wxwidgets.eclass.

Package-Manager: portage-2.1.2.3

diff --git a/dev-util/rapidsvn/ChangeLog b/dev-util/rapidsvn/ChangeLog
index 27419357caadbddd0d2a9b93d3a2cafdfbdfd9e9..bd2f2e1e58fa7117316dfa2571b2cfabe1bc4709 100644 (file)
--- a/dev-util/rapidsvn/ChangeLog
+++ b/dev-util/rapidsvn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/rapidsvn
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/ChangeLog,v 1.42 2007/04/01 00:59:40 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/ChangeLog,v 1.43 2007/04/08 03:56:40 dirtyepic Exp $
+
+  08 Apr 2007; Ryan Hill <dirtyepic@gentoo.org> rapidsvn-0.9.3.ebuild,
+  rapidsvn-0.9.4.ebuild:
+  Don't hardcode wx-config, use wxwidgets.eclass.
 
   01 Apr 2007; Steve Arnold <nerdboy@gentoo.org> rapidsvn-0.9.3.ebuild,
   rapidsvn-0.9.4.ebuild:

diff --git a/dev-util/rapidsvn/Manifest b/dev-util/rapidsvn/Manifest
index e13a49c4d9500adbd47fdcd303b94479ecdbb04e..d803bd7824cfb98088f24f1e09850a6eaabbda64 100644 (file)
--- a/dev-util/rapidsvn/Manifest
+++ b/dev-util/rapidsvn/Manifest
@@ -4,18 +4,18 @@ RMD160 3d2b6f48e46e3c5e39a499589043aa09de60d8c6 files/rapidsvn-svncpp_link.patch
 SHA256 99a4690987be6f39400a737ca12762495621fc2789fed18c5d9903a8d87ae968 files/rapidsvn-svncpp_link.patch 304
 DIST rapidsvn-0.9.3.tar.gz 998268 RMD160 316904503ab1a067fb14b0567d6e28bc2a6ad6c5 SHA1 71a57ffb4f7944191df51c4a2a87f1c971567543 SHA256 90363935f9a1cb3177d045679db39c94ee44ffc3d67ed63570900ca64771f139
 DIST rapidsvn-0.9.4.tar.gz 1057482 RMD160 edbabab261b69acc78a2009f2da175b2b70c8987 SHA1 0f8eff53964f641253d6a4be82187ab9f30168c7 SHA256 20c6a17ed91171bae6c3af7b611b0f91395cb2962fc0cfe1d66dfd5178d60651
-EBUILD rapidsvn-0.9.3.ebuild 2779 RMD160 10582f2f3b2defc9b12998577a00753f445ba7b6 SHA1 6e3948acad4f02f28ceab7cf3ad51c8cf0ec461e SHA256 6b9379ca107bc5226a46857dfac887d446889ef469673965359c9a9009f3b26d
-MD5 77e7be53edce5f85b6e26d95bc5b78a9 rapidsvn-0.9.3.ebuild 2779
-RMD160 10582f2f3b2defc9b12998577a00753f445ba7b6 rapidsvn-0.9.3.ebuild 2779
-SHA256 6b9379ca107bc5226a46857dfac887d446889ef469673965359c9a9009f3b26d rapidsvn-0.9.3.ebuild 2779
-EBUILD rapidsvn-0.9.4.ebuild 2793 RMD160 5b53dc80c7c14f1b5e027528e0ff344ed9d1aba3 SHA1 3613d0061d2a6def5f6bebe0d31a143965722228 SHA256 4558eedadc6dcb264bbc925931dcf57a515696c6b127e5093f5dcb16ad0ad670
-MD5 af509d4e1751d5c70751eb7942a9803d rapidsvn-0.9.4.ebuild 2793
-RMD160 5b53dc80c7c14f1b5e027528e0ff344ed9d1aba3 rapidsvn-0.9.4.ebuild 2793
-SHA256 4558eedadc6dcb264bbc925931dcf57a515696c6b127e5093f5dcb16ad0ad670 rapidsvn-0.9.4.ebuild 2793
-MISC ChangeLog 6999 RMD160 a2740f93c5af52b5f54c6ede0f522ed0c69baf04 SHA1 f63c93749d9f223654e9353dcbda4da4b917a095 SHA256 a62b268eb64ebb8fa11dc8db1f26943a6994a6d0162ddafb47ba067ee2d798c7
-MD5 b02e1d51b55a262b2bbe351c371c75a8 ChangeLog 6999
-RMD160 a2740f93c5af52b5f54c6ede0f522ed0c69baf04 ChangeLog 6999
-SHA256 a62b268eb64ebb8fa11dc8db1f26943a6994a6d0162ddafb47ba067ee2d798c7 ChangeLog 6999
+EBUILD rapidsvn-0.9.3.ebuild 2627 RMD160 3c5dab404db14e87bdbb550e87e55ae9b055a28b SHA1 659ac112844e9596cff8824a7f3d91ab67a5bd5b SHA256 6a1a525de1438334de09d013dd9c226d151200a5437aba0c232a0608db0bf7a4
+MD5 c2f57c6013ed8041e6cf52278da26f04 rapidsvn-0.9.3.ebuild 2627
+RMD160 3c5dab404db14e87bdbb550e87e55ae9b055a28b rapidsvn-0.9.3.ebuild 2627
+SHA256 6a1a525de1438334de09d013dd9c226d151200a5437aba0c232a0608db0bf7a4 rapidsvn-0.9.3.ebuild 2627
+EBUILD rapidsvn-0.9.4.ebuild 2639 RMD160 49a7713286243456cf4d36038140867c97020046 SHA1 9a75709e0e86a3e71396e9926090665354cfe39e SHA256 bbd7651f51e0b857d50b4bd36147a03a9c5e3f2db0e60d93441b6d1dfa93c731
+MD5 93f5df2b4d27ab1ce1e9284e50ed839c rapidsvn-0.9.4.ebuild 2639
+RMD160 49a7713286243456cf4d36038140867c97020046 rapidsvn-0.9.4.ebuild 2639
+SHA256 bbd7651f51e0b857d50b4bd36147a03a9c5e3f2db0e60d93441b6d1dfa93c731 rapidsvn-0.9.4.ebuild 2639
+MISC ChangeLog 7148 RMD160 6ae3f703d013d76b32d88e8cbc908fce02131650 SHA1 33b5e7586c38b7aaa84e5f497c8cf3f8951c689a SHA256 c96c229b53967796545715b7fa8ce699155435be1ddcfd8a0b835bc6a7c9a697
+MD5 9f28353f7a11788a389b94818076cd6d ChangeLog 7148
+RMD160 6ae3f703d013d76b32d88e8cbc908fce02131650 ChangeLog 7148
+SHA256 c96c229b53967796545715b7fa8ce699155435be1ddcfd8a0b835bc6a7c9a697 ChangeLog 7148
 MISC metadata.xml 518 RMD160 b9c97307a72d2c0ae05deb166229ffc603d8855b SHA1 6b9c6a8c99c7dd184cf048b4e306f0a0e5f81788 SHA256 b7e173df02d2585da2771a95e6acd8ae824e61887087747d227b9ea07bf0b435
 MD5 35d9a0711821962697d1e9a351f7ea58 metadata.xml 518
 RMD160 b9c97307a72d2c0ae05deb166229ffc603d8855b metadata.xml 518

diff --git a/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild b/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild
index 042fa7f025e9d195e4d51473a4a2593d23e2f88e..6b277836e25846e2d56a132b8434e08c54961892 100644 (file)
--- a/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild
+++ b/dev-util/rapidsvn/rapidsvn-0.9.3.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/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild,v 1.12 2007/04/01 00:59:40 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild,v 1.13 2007/04/08 03:56:40 dirtyepic Exp $
 
-inherit eutils libtool autotools
+inherit eutils libtool autotools wxwidgets
 
 DESCRIPTION="Cross-platform GUI front-end for the Subversion revision system."
 HOMEPAGE="http://rapidsvn.tigris.org/"
@@ -61,12 +61,10 @@ src_compile() {
        else
                myconf="${myconf} --disable-static --enable-shared"
        fi
-       # look for wx-config-2.6
-       if (test -x /usr/bin/wx-config-2.6 && `/usr/bin/wx-config-2.6 --toolkit=gtk2 2>/dev/null` ); then
-               myconf="${myconf} --with-wx-config=/usr/bin/wx-config-2.6"
-       else
-               ewarn "wx-config-2.6 not found. Compiling with default wxGTK."
-       fi
+
+       export WX_GTK_VER="2.6"
+       need-wxwidgets gtk2
+       myconf="${myconf} --with-wx-config=${WX_CONFIG}"
 
        econf   --with-svn-lib=/usr/$(get_libdir) \
                --with-svn-include=/usr/include \

diff --git a/dev-util/rapidsvn/rapidsvn-0.9.4.ebuild b/dev-util/rapidsvn/rapidsvn-0.9.4.ebuild
index 8462d809fbf35ba71c2631abdd7916ba649ab9cf..5631a671d5d8fc342b4fa85258ac12d47411ebc8 100644 (file)
--- a/dev-util/rapidsvn/rapidsvn-0.9.4.ebuild
+++ b/dev-util/rapidsvn/rapidsvn-0.9.4.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/dev-util/rapidsvn/rapidsvn-0.9.4.ebuild,v 1.4 2007/04/01 00:59:40 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.9.4.ebuild,v 1.5 2007/04/08 03:56:40 dirtyepic Exp $
 
-inherit eutils libtool autotools
+inherit eutils libtool autotools wxwidgets
 
 DESCRIPTION="Cross-platform GUI front-end for the Subversion revision system."
 HOMEPAGE="http://rapidsvn.tigris.org/"
@@ -14,7 +14,7 @@ IUSE="doc static"
 
 DEPEND=">=dev-util/subversion-1.3.2-r1
        >=net-misc/neon-0.26
-       >=x11-libs/wxGTK-2.6.2
+       =x11-libs/wxGTK-2.6*
        <dev-libs/apr-0.9.13
        doc? ( dev-libs/libxslt
            app-text/docbook-sgml-utils
@@ -61,12 +61,10 @@ src_compile() {
        else
                myconf="${myconf} --disable-static --enable-shared"
        fi
-       # look for wx-config-2.6
-       if (test -x /usr/bin/wx-config-2.6 && `/usr/bin/wx-config-2.6 --toolkit=gtk2 2>/dev/null` ); then
-               myconf="${myconf} --with-wx-config=/usr/bin/wx-config-2.6"
-       else
-               ewarn "wx-config-2.6 not found. Compiling with default wxGTK."
-       fi
+
+       export WX_GTK_VER="2.6"
+       need-wxwidgets gtk2
+       myconf="${myconf} --with-wx-config=${WX_CONFIG}"
 
        econf   --with-svn-lib=/usr/$(get_libdir) \
                --with-svn-include=/usr/include \