gtk2 -> gtk

Package-Manager: portage-2.1.2_rc4-r1

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index fd7cd00088d6478da7123dec0b8ccb10442e82e9..1da7e5fe69c10c2ac2493383cd4ec89e8bff9ba5 100644 (file)
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.128 2006/11/23 16:48:09 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.129 2006/12/28 02:33:24 dirtyepic Exp $
+
+  28 Dec 2006; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.4.2-r4.ebuild:
+  gtk2 -> gtk
 
   23 Nov 2006; <yvasilev@gentoo.org> wxGTK-2.6.3.3.ebuild:
   Keyworded arm on request by leio.

diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 687e029e63effa139185a36828bda51d1f2d282a..7ba7e84b08b9328d05095516df0f1f843eaa3fd9 100644 (file)
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX intl.cpp.diff 581 RMD160 75ac177252f70210f10e6cec937d1c3782fff861 SHA1 2fdada93bb8b8450f3959009b3803795a8957890 SHA256 c70d00558c976c51fb00e6b487c811cefae0abef5005384b3674998e9d730217
 MD5 b0a51d86a603a6aa6b8447cd7ad8cc9b files/intl.cpp.diff 581
 RMD160 75ac177252f70210f10e6cec937d1c3782fff861 files/intl.cpp.diff 581
@@ -56,10 +53,10 @@ DIST wxWidgets-2.6.1.tar.bz2 12649487 RMD160 20c009754f70cd3e983aba795306838fa62
 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 5053 RMD160 81ccf93a8789ba83d378b882622c875c68aa29ff SHA1 390cedd99d27c946158bc67487a3ea79e1332dcf SHA256 6c9a06b942a07d1d7d3c0a096152a7d556576297d201f99a9edba77312632356
-MD5 fb18f3e7302e5f4f30a63fc630e2c9d6 wxGTK-2.4.2-r4.ebuild 5053
-RMD160 81ccf93a8789ba83d378b882622c875c68aa29ff wxGTK-2.4.2-r4.ebuild 5053
-SHA256 6c9a06b942a07d1d7d3c0a096152a7d556576297d201f99a9edba77312632356 wxGTK-2.4.2-r4.ebuild 5053
+EBUILD wxGTK-2.4.2-r4.ebuild 5046 RMD160 41848e0fda7f78341b5d61241f8088e4b6c3de06 SHA1 a1f3a4e17251482545c4692bda12b1e68142b984 SHA256 61d274f9178bee382622c14f30fc78b30ae215fa87e96faeae9a64be09683e15
+MD5 4d588e60a52add2763e94246b5b7dfac wxGTK-2.4.2-r4.ebuild 5046
+RMD160 41848e0fda7f78341b5d61241f8088e4b6c3de06 wxGTK-2.4.2-r4.ebuild 5046
+SHA256 61d274f9178bee382622c14f30fc78b30ae215fa87e96faeae9a64be09683e15 wxGTK-2.4.2-r4.ebuild 5046
 EBUILD wxGTK-2.6.1.ebuild 1922 RMD160 e2f3f5f13d3be95b7db3442f5b81bfd39048c2bb SHA1 efb3158959bff99f142d4345445017b3f56ed914 SHA256 6b3e456121ed88b0a934657361b9dbe25add4c35cb0d5f1297b2c6a0a7f67d5d
 MD5 56de842cb982e2aeb27abbfe3cb3d2ff wxGTK-2.6.1.ebuild 1922
 RMD160 e2f3f5f13d3be95b7db3442f5b81bfd39048c2bb wxGTK-2.6.1.ebuild 1922
@@ -72,10 +69,10 @@ EBUILD wxGTK-2.6.3.3.ebuild 5125 RMD160 e18fd0fbdf672b55a31ac47575fbc24d751c10d8
 MD5 f124227e9944f854167c185fbf464d62 wxGTK-2.6.3.3.ebuild 5125
 RMD160 e18fd0fbdf672b55a31ac47575fbc24d751c10d8 wxGTK-2.6.3.3.ebuild 5125
 SHA256 b24ecf7d4ddec8d70277d4500744a42d6a3aeff1b488f1f21fe4b411c0e67092 wxGTK-2.6.3.3.ebuild 5125
-MISC ChangeLog 20218 RMD160 1b0bb3251dbb62143c7919eb719c38943bbfd646 SHA1 fb24b932a1be7a57a2285215ea1453875b1d89bd SHA256 05a8c1be7bb7075347e7127c8fe48fbb8f379b83e432b8b655f543b631c16fd9
-MD5 1677fd6832441534352057c852ad24eb ChangeLog 20218
-RMD160 1b0bb3251dbb62143c7919eb719c38943bbfd646 ChangeLog 20218
-SHA256 05a8c1be7bb7075347e7127c8fe48fbb8f379b83e432b8b655f543b631c16fd9 ChangeLog 20218
+MISC ChangeLog 20305 RMD160 68670f620546fe317205e9725e8ad4e7657eaef0 SHA1 4bdccf3e6e822010bc8e6162d497186318e3a500 SHA256 0c1f71351dab6de7ce4463122d15b6f417e706bbc5c7beded5ade5f8696712dc
+MD5 b9ec2c8ea906e69467a882d3c15bbbcf ChangeLog 20305
+RMD160 68670f620546fe317205e9725e8ad4e7657eaef0 ChangeLog 20305
+SHA256 0c1f71351dab6de7ce4463122d15b6f417e706bbc5c7beded5ade5f8696712dc ChangeLog 20305
 MISC metadata.xml 162 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 SHA1 04e3121e3f51426fec226bfdfc9df29349b754b6 SHA256 4fa9b642f4f36552d79a4d9fe18252c123d38c359f64f2f2709df866084a4b4e
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 metadata.xml 162
@@ -92,10 +89,3 @@ SHA256 5b793e6ce19b46528f537fd7e5ec07761b282ae7b4200dc04272315a9b8c709b files/di
 MD5 eb68af7b26b012c1917773f8e8ef72ac files/digest-wxGTK-2.6.3.3 536
 RMD160 df919a5e942c91fc9be13999d0b3db38d3880b3c files/digest-wxGTK-2.6.3.3 536
 SHA256 38f9f296e8a111b7459cdc57231520a7d0277574f8153cb2353c46534378695f files/digest-wxGTK-2.6.3.3 536
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFZdBnyZl4piiTjjYRAitIAJ91cmK83jJE138MPYxHUwrUUxhpUwCgwTS0
-BVO9iHUFdUQYJrBohg75mCY=
-=+xQR
------END PGP SIGNATURE-----

diff --git a/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild
index 3bc4c17cf7b26dbc26b59fafdf8fcb7b137eed04..a0c9ecccf751274ff0ad377f20b968ceea7ac124 100644 (file)
--- a/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.7 2006/10/15 03:49:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild,v 1.8 2006/12/28 02:33:24 dirtyepic Exp $
 
 inherit flag-o-matic eutils gnuconfig multilib toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2"
 LICENSE="wxWinLL-3"
 SLOT="2.4"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="debug wxgtk1 gtk2 odbc opengl unicode"
+IUSE="debug wxgtk1 gtk odbc opengl unicode"
 
 RDEPEND="sys-libs/zlib
        media-libs/libpng
@@ -19,10 +19,10 @@ RDEPEND="sys-libs/zlib
        media-libs/tiff
        !unicode? ( odbc? ( dev-db/unixODBC ) )
        opengl? ( virtual/opengl )
-       gtk2? ( >=x11-libs/gtk+-2.0 >=dev-libs/glib-2.0 )
+       gtk? ( >=x11-libs/gtk+-2.0 >=dev-libs/glib-2.0 )
        wxgtk1? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* )"
 DEPEND="${RDEPEND}
-       gtk2? ( dev-util/pkgconfig )"
+       gtk? ( dev-util/pkgconfig )"
 
 # Note 1: Gettext is not runtime dependency even if nls? because wxWidgets
 #         has its own implementation of it
@@ -57,18 +57,18 @@ src_unpack() {
 pkg_setup() {
        einfo "New in >=wxGTK-2.4.2-r2:"
        einfo "------------------------"
-       einfo "You can now have gtk, gtk2 and unicode versions installed"
+       einfo "You can now have gtk1, gtk2 and unicode versions installed"
        einfo "simultaneously. Use wxgtk1 if you would like a gtk1 lib."
-       einfo "Put gtk2 and unicode in your USE flags to get those"
+       einfo "Put gtk and unicode in your USE flags to get those"
        einfo "additional versions."
        einfo "NOTE:"
        einfo "You can also get debug versions of any of those, but not debug"
        einfo "and normal installed at the same time."
        if  use unicode; then
-               ! use gtk2 && die "You must put gtk2 in your USE if you need unicode support"
+               ! use gtk && die "You must put gtk in your USE if you need unicode support"
        fi
-       if ! use wxgtk1 && ! use gtk2; then
-               die "You must have at least gtk2 or wxgtk1 in your USE"
+       if ! use wxgtk1 && ! use gtk; then
+               die "You must have at least gtk or wxgtk1 in your USE"
        fi
 }
 
@@ -96,7 +96,7 @@ src_compile() {
        fi
        cd ${S}
 
-       if use gtk2 ; then
+       if use gtk ; then
                myconf="${myconf} --enable-gtk2"
                einfo "Building gtk2 version"
                mkdir build_gtk2