Convert from "useq" to "use".

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

3 files changed, 30 insertions, 17 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 5f8643f99b64..34b59b80ab59 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.112 2011/07/05 01:00:30 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.113 2011/07/08 10:19:55 ssuominen Exp $
+
+  08 Jul 2011; Samuli Suominen <ssuominen@gentoo.org> gdal-1.6.3-r1.ebuild:
+  Convert from "useq" to "use".
 
   05 Jul 2011; Steve Arnold <nerdboy@gentoo.org> gdal-1.8.0-r1.ebuild:
   This should fix the seemingly random (and unreproducible by me) install 
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index e0f4a7dce156..d160eefb7d96 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 1.7.2-ruby_cflags.patch 1161 RMD160 5635b016c18a54a45e4f9410028f0a4596b52e5b SHA1 42389f01f14ba57a6337a9a1cdbe889c9fc34d61 SHA256 8a943b69b200e8b926e2ed9ad1861a152731bb829459f402a8024e1137eed754
 AUX gdal-1.4.2-datadir.patch 353 RMD160 a5dec6a5bbe091b6e877ced363507798d0ed47d5 SHA1 eddb7f332ff361cbfb8771cc7496d2428a290d71 SHA256 761e5dc10bb8a0d6a270af62aa67e7ec1259f072db958969ce14812f85004c4e
 AUX gdal-1.5.0-install_name.patch 1731 RMD160 9e6d9d2a8a14bf01de242d889140369d083fd7c4 SHA1 4c46ebb1bb7d5f5ca2f1079e6ad1a1230ef698ef SHA256 da631282e7ee42b3f9c46a4ce76d7b4905caa4a056c8109fce0f661b9aa58abd
@@ -8,7 +11,14 @@ AUX gdal-1.6.1-ruby-make.patch 1150 RMD160 8e5b8397a86506d968cbf1a5a04616303df26
 AUX gdal-png-1.5.patch 1422 RMD160 5177f60d44189289fefc98ec8f59645b880b7362 SHA1 63c3290883f6f9f70fe6ec9cd2c3e37becaeee7b SHA256 c7a5c4584b60c653b0f2116d9898e5110fe0e29d175a2fc00d34d36487856418
 DIST gdal-1.6.3.tar.gz 7007613 RMD160 aab37ae4b7a98f9af6c10511e2ce5205505b9769 SHA1 b8fc53f562dd253c0c75e9ea4d4398f9548c1f1f SHA256 bf946aa229eef28f3d95c8bbf75913aa2d89dd93a03c5cc769cd7c8b98890c67
 DIST gdal-1.8.0.tar.gz 8837824 RMD160 0e116f41b23ff5b44c692f56459facab332c6201 SHA1 e5a2802933054050c6fb0b0a0e1f46b5dd195b0a SHA256 515f0316cd17281a09a147914b47b28bbc4855cdb86d41d12cb8716d1721e435
-EBUILD gdal-1.6.3-r1.ebuild 6944 RMD160 6cc5139d6e9d67417867cc65b73a79c9b0e67342 SHA1 a64a3e9c00a208304076b7432b5f6699b1296f16 SHA256 8fee7711d458b29d1295ab9831d54a4659343f167e3cd0bee9c035b29912ae2c
+EBUILD gdal-1.6.3-r1.ebuild 6930 RMD160 09dee099e02be65fd6070e4a5ec164d1a3ddddc6 SHA1 5aba63b7563d0be771e4251dd4c356bbb08749a8 SHA256 b28b61ddca3bbf8216fe53ed781e54c679d9fd8f642814cc1206fb96f0ea98cd
 EBUILD gdal-1.8.0-r1.ebuild 6647 RMD160 ec6b534d3bbc60c2f176238da07404663d4f3598 SHA1 fb5e807503df245b17e637aea67ad466d239f56b SHA256 8b8c1b4cea5567d8d743f2f1acc9a57b504651f642e980978a59811f37cf94cd
-MISC ChangeLog 21174 RMD160 8f4cb37a6bbdc40cf77e406956c7cee4b9e5bcd3 SHA1 a1df02df1ddb0e967703d2d0f3b1f001116a8b3d SHA256 e5c633e71d894a30f80f87c84871e3445dcb1062643e78eabda8adeca09e5b31
+MISC ChangeLog 21285 RMD160 22ca5f638822c223ef0eeeb00658be8909210128 SHA1 6173ff8f615207fe87c75d31edb6fc87544c4087 SHA256 67babb6be079b423fa35bead9e2974d84ed168bcfc5c43b61284621eafab1799
 MISC metadata.xml 1177 RMD160 1711328052cf0a70e14142ea08d571d564288c68 SHA1 c791c4e490071c65aad3938cee40e54db4541de4 SHA256 2d9cf1dfaf4d13f428e1dc5b5e4f5dfea3997475d09f994ce858f90768329807
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk4W2XwACgkQXkR9YqOcLPGeewD/Xfg3s2momae64hlJ5sMLy2VW
+b9rMu7sKvGkAMgin9DcA/0RmVI90fuOjgRyH08jbXK+1H8W8/DRv9aemavyPvAv+
+=Hhog
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/gdal/gdal-1.6.3-r1.ebuild b/sci-libs/gdal/gdal-1.6.3-r1.ebuild
index d6e4655b840e..ab3c20f20320 100644
--- a/sci-libs/gdal/gdal-1.6.3-r1.ebuild
+++ b/sci-libs/gdal/gdal-1.6.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild,v 1.18 2011/04/12 17:41:54 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild,v 1.19 2011/07/08 10:19:55 ssuominen Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.5"
@@ -93,12 +93,12 @@ src_configure() {
 	pkg_conf="${pkg_conf} --enable-shared=yes --with-pic \
 		--with-libgrass=no --without-libtool --with-expat=${EPREFIX}/usr"
 
-	if useq hdf && useq netcdf; then
+	if use hdf && use netcdf; then
 		ewarn "Netcdf and HDF4 are incompatible due to certain tools in"
 		ewarn "common; HDF5 is now the preferred choice for HDF data."
 		ewarn "Disabling hdf4 in favor of NetCDF..."
 		use_conf="--with-netcdf --with-hdf4=no"
-	elif useq hdf && ! useq netcdf; then
+	elif use hdf && ! use netcdf; then
 		use_conf="--with-netcdf=no --with-hdf4"
 	else
 		use_conf="$(use_with netcdf)"
@@ -112,21 +112,21 @@ src_configure() {
 	    $(use_with jpeg2k jasper) $(use_with odbc) $(use_enable debug)"
 
 	# It can't find this
-	if useq ogdi ; then
+	if use ogdi ; then
 	    use_conf="--with-ogdi=${EPREFIX}/usr ${use_conf}"
 	fi
 
-	if useq mysql ; then
+	if use mysql ; then
 	    use_conf="--with-mysql=${EPREFIX}/usr/bin/mysql_config ${use_conf}"
 	fi
 
-	if useq gif ; then
+	if use gif ; then
 	    use_conf="--with-gif=internal ${use_conf}"
 	else
 	    use_conf="--with-gif=no ${use_conf}"
 	fi
 
-	if useq python ; then
+	if use python ; then
 	    use_conf="--with-pymoddir=${EPREFIX}/$(python_get_sitedir) \
 		${use_conf}"
 	fi
@@ -147,7 +147,7 @@ src_configure() {
 src_compile() {
 	local i
 	for i in perl ruby python; do
-		if useq $i; then
+		if use $i; then
 			rm "${S}"/swig/$i/*_wrap.cpp
 			emake -C "${S}"/swig/$i generate || \
 				die "make generate failed for swig/$i"
@@ -158,28 +158,28 @@ src_compile() {
 	# also failing with gcc4 in libcsf
 	emake -j1 || die "emake failed"
 
-	if useq python; then
+	if use python; then
 	    sed -i -e "s#library_dirs = #library_dirs = ${EPREFIX}/usr/$(get_libdir):#g" \
 		swig/python/setup.cfg || die "sed python setup.cfg failed"
 	    sed -i -e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
 		swig/python/GNUmakefile || die "sed python makefile failed"
 	fi
 
-	if useq perl ; then
+	if use perl ; then
 	    cd "${S}"/swig/perl
 	    perl-module_src_prep
 	    perl-module_src_compile
 	    cd "${S}"
 	fi
 
-	if useq doc ; then
+	if use doc ; then
 	    make docs || die "make docs failed"
 	fi
 }
 
 src_install() {
 
-	if useq perl ; then
+	if use perl ; then
 	    cd "${S}"/swig/perl
 	    perl-module_src_install
 	    sed -i -e "s:BINDINGS        =       python ruby perl:BINDINGS        =       python ruby:g" \
@@ -193,13 +193,13 @@ src_install() {
 
 	dodoc Doxyfile HOWTO-RELEASE NEWS
 
-	if useq doc ; then
+	if use doc ; then
 	    dohtml html/* || die "install html failed"
 	    docinto ogr
 	    dohtml ogr/html/* || die "install ogr html failed"
 	fi
 
-	if useq python; then
+	if use python; then
 	    newdoc swig/python/README.txt README-python.txt
 	    dodir /usr/share/${PN}/samples
 	    insinto /usr/share/${PN}/samples