s/wxwindows/wxwidgets

Package-Manager: portage-2.2_rc75/cvs/Linux x86_64

3 files changed, 26 insertions, 13 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index 87628bd64d33..3edb44c5ff3c 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.89 2010/09/04 02:29:11 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.90 2010/09/05 04:41:48 dirtyepic Exp $
+
+  05 Sep 2010; Ryan Hill <dirtyepic@gentoo.org> grass-6.3.0.ebuild:
+  s/wxwindows/wxwidgets
 
 *grass-6.4.0 (04 Sep 2010)
 
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 8ce8767d29e3..33c1265c8f07 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX grass-6.3.0-gcc44.patch 387 RMD160 d104b2cbea3ee14d8f266da122d9e4aef63dc6b0 SHA1 1ce70dbb99f64419361816a75e6948d8960d4f4f SHA256 210e7f7f34ec04caf41bd312f5c90c7be206656766e98725f27185e0c8759f80
 AUX grass-6.3.0-html-nonviz.patch 763 RMD160 054b336fcc47d64e56a40d2dda955732047ceb08 SHA1 e8f10078f8cccc5a47d2f2c8bed1d9ace7ed2598 SHA256 e870d724170a9d629a5d0bb8897a2e2f5d1b25eed204a7450061f26d48192981
 AUX grass-6.3.0-o_creat.patch 1469 RMD160 dd2cec8103c07eabd906f3792544bf2225cb1287 SHA1 3bb27a3069abb47b3ac6a9480c508a036d1f3aba SHA256 b9bb9ea09414fbcb00b52520cd4e98147d3de199401efe9996eb6f911fd7ef05
@@ -6,7 +9,14 @@ AUX grass-pkgconf.patch 1322 RMD160 7b48d8e05a07090d8d36d2fb96b385f2d655e066 SHA
 AUX grass_icon.png 4470 RMD160 b4a6deeb6ce859a57c6aba3c4095e2dd718f36e9 SHA1 6839c28ec1d01c486d45a245a159fced3c0d0810 SHA256 c6c873f24bb59b8ff98000b500ca3a047ca86af216b4b7b1593baef5f2fbe6a9
 DIST grass-6.3.0.tar.gz 17688547 RMD160 66db4223fc0d5172371903f71d68f1dd024ad2d2 SHA1 c4b0b1407655f8ed1e16e911df191323fe00eb9e SHA256 a84658a7065a3ece09d3d18a3b601515484d1e5dbb3a92b8fbac3c37e368acf4
 DIST grass-6.4.0.tar.gz 22569021 RMD160 b0bd2d2ce048a5f10f345786bc81fa4bd22df019 SHA1 c91e8501c7a756a94d2be47729f640d33b2a7468 SHA256 1db0422de4bb6146322721760b3c2b310850069ee320e03b6a625e4472f477a7
-EBUILD grass-6.3.0.ebuild 8468 RMD160 f7c48a68e30121df5dcd345751aec3bd61b3d293 SHA1 d2c70782e38936b81ea191bd95b5b25cd4661d49 SHA256 ce2ceda730a2fa8ecf651cf80410332d56f4765e25a38b4dbc5f23fd317f7276
+EBUILD grass-6.3.0.ebuild 8470 RMD160 9c0c89eeedca9c18436e2518aba9010cc4d987ca SHA1 90444b7d8aa6dbd35011d73284f3f7ff4d3b3b8d SHA256 eba81a009a9aa4b9df0a5c6f773859f59fc1c313d5186e9151c480152f8becc8
 EBUILD grass-6.4.0.ebuild 8329 RMD160 94ef49a50c67e4e68a9e1d7aaff48b824f00abda SHA1 0343afe4b9e551ffc4bfab6e3994f22b53f75564 SHA256 2ccd0458604a6fddf10d189ca37840a73bd78e032823561fd53333b44377bb72
-MISC ChangeLog 18200 RMD160 47ed11fb225ba1f3baa60b02c00655b27be6228c SHA1 375837e9b27255b642fb3d3f61a922ba4270de2c SHA256 083ca8084c99ef241ab7c0804ed922811d57d7cf790f103fb72996b9217da4e7
+MISC ChangeLog 18295 RMD160 7c17d55cce9a5a01a3bd5a484536924caf589889 SHA1 2b98a436d5515c49053406b2ee3da40e37b30edf SHA256 9cb1e619aba18dff639a09f267c6c8addc4630f1d7bb55e528ffda844599d09f
 MISC metadata.xml 689 RMD160 e86713ba2244d319bd1d76241c6e23d9bbb1ed35 SHA1 e6ef423536dc2e57b8f699fe24fe6af865f747df SHA256 e47a71f5bbefcdbce341e5445a88d1f7954762370a7f15628c56e7a31243f70e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyDILgACgkQiqiDRvmkBmKTygCgqGAoBu+ZB2Jrivukb0uAuTL+
+2+MAoKn6Xv9cA6chpjUVq9y8p6A7M8yC
+=XQ2L
+-----END PGP SIGNATURE-----
diff --git a/sci-geosciences/grass/grass-6.3.0.ebuild b/sci-geosciences/grass/grass-6.3.0.ebuild
index c33dd75167b9..fe57648031eb 100644
--- a/sci-geosciences/grass/grass-6.3.0.ebuild
+++ b/sci-geosciences/grass/grass-6.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild,v 1.15 2010/06/17 21:03:51 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild,v 1.16 2010/09/05 04:41:48 dirtyepic Exp $
 
 inherit eutils distutils fdo-mime versionator wxwidgets
 
@@ -17,7 +17,7 @@ SLOT="6"
 KEYWORDS="amd64 ppc ~ppc64 sparc x86"
 
 IUSE="ffmpeg fftw gmath jpeg largefile motif mysql nls odbc opengl png \
-postgres python readline sqlite tiff truetype wxwindows X"
+postgres python readline sqlite tiff truetype wxwidgets X"
 
 RESTRICT="strip"
 
@@ -48,7 +48,7 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 	sqlite? ( dev-db/sqlite )
 	tiff? ( >=media-libs/tiff-3.5.7 )
 	truetype? ( >=media-libs/freetype-2.0 )
-	wxwindows? (
+	wxwidgets? (
 		>=dev-python/wxpython-2.8.1.1
 		>=dev-lang/python-2.4
 	)
@@ -69,7 +69,7 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4a
 	>=sys-devel/bison-1.35
-	wxwindows? ( >=dev-lang/swig-1.3.31 )
+	wxwidgets? ( >=dev-lang/swig-1.3.31 )
 	X? (
 		x11-proto/xproto
 		x11-proto/xextproto
@@ -80,7 +80,7 @@ pkg_setup() {
 	elog ""
 	elog "This version enables the experimental wxpython interface, which"
 	elog "you may want to try.  If the legacy GUI seems a little wonky in"
-	elog "this version, just enable the wxwindows USE flag and rebuild"
+	elog "this version, just enable the wxwidgets USE flag and rebuild"
 	elog "grass to use it."
 	elog ""
 	if use gmath; then
@@ -149,7 +149,7 @@ src_compile() {
 	    myconf="${myconf} --with-tcltk --with-x \
 	        --with-tcltk-includes=/usr/include \
 		--with-tcltk-libs=${TCL_LIBDIR}"
-	    if use wxwindows; then
+	    if use wxwidgets; then
 		WX_GTK_VER=2.8
 		need-wxwidgets unicode
 		# The following lib should be there, based on the above and the
@@ -158,7 +158,7 @@ src_compile() {
 		LIBGDI="$(python_get_sitedir)/wx-${WX_GTK_VER}-gtk2-unicode/wx/_gdi_.so"
 		myconf="${myconf} --with-python --with-wxwidgets=${WX_CONFIG}"
 	    else
-		# USE=python must be enabled above if wxwindows is enabled
+		# USE=python must be enabled above if wxwidgets is enabled
 		myconf="${myconf} $(use_with python) --without-wxwidgets"
 	    fi
 	else
@@ -221,7 +221,7 @@ src_compile() {
 		$(use_with readline) \
 		$(use_with tiff) || die "configure failed!"
 
-	if use wxwindows; then
+	if use wxwidgets; then
 	    # can't use die here since we need to hack the vdigit build
 	    emake -j1
 	    ln -sf "${LIBGDI}" dist.${CHOST}/lib/libgdi.so \
@@ -240,7 +240,7 @@ src_install() {
 	    PREFIX="${D}"usr INST_DIR="${D}"usr/${MY_PM} \
 	    || die "make install failed!"
 
-	if use wxwindows; then
+	if use wxwidgets; then
 	    ln -sf "${LIBGDI}" "${D}"usr/${MY_PM}/lib/libgdi.so \
 		|| die "failed to find wx library"
 	fi
@@ -274,7 +274,7 @@ pkg_postrm() {
 
 generate_files() {
 	local GUI="-gui"
-	use wxwindows && GUI="-wxpython"
+	use wxwidgets && GUI="-wxpython"
 
 	cat <<-EOF > 99grass-6
 	GRASS_LD_LIBRARY_PATH="/usr/${MY_PM}/lib"