Rearrange the ebuild, no external changes

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

5 files changed, 104 insertions, 96 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 34b59b80ab59..7469f1ef4985 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,10 @@
 # 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.113 2011/07/08 10:19:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.114 2011/07/16 17:45:46 jlec Exp $
+
+  16 Jul 2011; Justin Lecher <jlec@gentoo.org> gdal-1.6.3-r1.ebuild,
+  gdal-1.8.0-r1.ebuild, metadata.xml:
+  Rearrange the ebuild, no external changes
 
   08 Jul 2011; Samuli Suominen <ssuominen@gentoo.org> gdal-1.6.3-r1.ebuild:
   Convert from "useq" to "use".
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index d160eefb7d96..e9a635668325 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 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
@@ -11,14 +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 6930 RMD160 09dee099e02be65fd6070e4a5ec164d1a3ddddc6 SHA1 5aba63b7563d0be771e4251dd4c356bbb08749a8 SHA256 b28b61ddca3bbf8216fe53ed781e54c679d9fd8f642814cc1206fb96f0ea98cd
-EBUILD gdal-1.8.0-r1.ebuild 6647 RMD160 ec6b534d3bbc60c2f176238da07404663d4f3598 SHA1 fb5e807503df245b17e637aea67ad466d239f56b SHA256 8b8c1b4cea5567d8d743f2f1acc9a57b504651f642e980978a59811f37cf94cd
-MISC ChangeLog 21285 RMD160 22ca5f638822c223ef0eeeb00658be8909210128 SHA1 6173ff8f615207fe87c75d31edb6fc87544c4087 SHA256 67babb6be079b423fa35bead9e2974d84ed168bcfc5c43b61284621eafab1799
-MISC metadata.xml 1177 RMD160 1711328052cf0a70e14142ea08d571d564288c68 SHA1 c791c4e490071c65aad3938cee40e54db4541de4 SHA256 2d9cf1dfaf4d13f428e1dc5b5e4f5dfea3997475d09f994ce858f90768329807
+EBUILD gdal-1.6.3-r1.ebuild 6735 RMD160 5e29a11f00004e879c12b774597b19d0b5b7947e SHA1 9b389f851c4c577ecd638a0ba18b2488ccb9c86f SHA256 82eed125dcc005990b7f1e9d223308c1d00cdf47a1b33ca966488c56b3ace9e3
+EBUILD gdal-1.8.0-r1.ebuild 6634 RMD160 2c9a1b55df4fcc9983a6308212b1c46d956aa6e3 SHA1 80e3878d96b1f92314a355ed1b32f93c4e2386fc SHA256 0dc221869789048e6658232755067de9d598a5a05bc5e4c6ac9170679a671963
+MISC ChangeLog 21432 RMD160 a3357c706ba1c82c68885085165d72684df76e77 SHA1 a687f9157a291055eb379e7531c0220dea871dfb SHA256 52161b9c5887ae8162f8ed8aa0669ed9997f29702331ead86a8c085b653b3091
+MISC metadata.xml 1183 RMD160 a095695d479404c183e066274335dacc408bd406 SHA1 0c07b2188a4e5e2cff50ba6355a1543e7f70ed57 SHA256 789b3c4b281326a6c763ac9a62f3e1ef82ddf679e71bc7d1a1849d3772a4323e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4W2XwACgkQXkR9YqOcLPGeewD/Xfg3s2momae64hlJ5sMLy2VW
-b9rMu7sKvGkAMgin9DcA/0RmVI90fuOjgRyH08jbXK+1H8W8/DRv9aemavyPvAv+
-=Hhog
+iEYEAREKAAYFAk4hzlEACgkQgAnW8HDreRZHTwCeOr1YNsHiArUcsJlpgJ59Fqo4
+dKMAoInfpp5nnIeIX+VUvJbfRl4lMPKU
+=Efvd
 -----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 ab3c20f20320..4d494b3ead42 100644
--- a/sci-libs/gdal/gdal-1.6.3-r1.ebuild
+++ b/sci-libs/gdal/gdal-1.6.3-r1.ebuild
@@ -1,16 +1,19 @@
 # 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.19 2011/07/08 10:19:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild,v 1.20 2011/07/16 17:45:46 jlec Exp $
+
+EAPI=3
 
-EAPI="3"
 WANT_AUTOCONF="2.5"
+
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby18"
-PYTHON_DEPEND="2"
+
+PYTHON_DEPEND="python? 2"
 
 inherit autotools eutils perl-module python ruby toolchain-funcs
 
-DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
 HOMEPAGE="http://www.gdal.org/"
 SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
 
@@ -20,20 +23,19 @@ KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 # need to get these arches updated on several libs first
 #KEYWORDS="~alpha ~hppa"
 
-IUSE="curl debug doc ecwj2k fits geos gif gml hdf hdf5 jpeg jpeg2k mysql \
-netcdf odbc png ogdi perl postgres python ruby sqlite threads"
+IUSE="curl debug doc ecwj2k fits geos gif gml hdf hdf5 jpeg jpeg2k mysql netcdf odbc png ogdi perl postgres python ruby sqlite threads"
 
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=media-libs/tiff-3.9.1
-	sci-libs/libgeotiff
+RDEPEND="
 	dev-libs/expat
+	media-libs/tiff
+	sci-libs/libgeotiff
+	sys-libs/zlib
 	curl? ( net-misc/curl )
 	jpeg? ( virtual/jpeg )
 	gif? ( media-libs/giflib )
 	png? ( media-libs/libpng )
 	perl? ( dev-lang/perl )
-	python? ( dev-lang/python
-		dev-python/numpy )
+	python? ( dev-python/numpy )
 	ruby? ( >=dev-lang/ruby-1.8.4.20060226 )
 	fits? ( sci-libs/cfitsio )
 	ogdi? ( sci-libs/ogdi )
@@ -41,16 +43,16 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 	hdf5? ( >=sci-libs/hdf5-1.6.4 )
 	postgres? ( dev-db/postgresql-base )
 	|| (
-	    netcdf? ( sci-libs/netcdf )
-	    hdf? ( sci-libs/hdf )
+		netcdf? ( sci-libs/netcdf )
+		hdf? ( sci-libs/hdf )
 	)
 	|| (
-	    jpeg2k? ( media-libs/jasper )
-	    ecwj2k? ( sci-libs/libecwj2 )
+		jpeg2k? ( media-libs/jasper )
+		ecwj2k? ( sci-libs/libecwj2 )
 	)
 	mysql? ( virtual/mysql )
-	odbc?   ( dev-db/unixODBC )
-	geos?   ( >=sci-libs/geos-2.2.1 )
+	odbc? ( dev-db/unixODBC )
+	geos? ( >=sci-libs/geos-2.2.1 )
 	sqlite? ( >=dev-db/sqlite-3 )"
 
 DEPEND="${RDEPEND}
@@ -63,10 +65,10 @@ AT_M4DIR="${S}/m4"
 
 pkg_setup() {
 	if [ -n "${GDAL_CONFIGURE_OPTS}" ]; then
-	    elog "User-specified configure options are ${GDAL_CONFIGURE_OPTS}."
+		elog "User-specified configure options are ${GDAL_CONFIGURE_OPTS}."
 	else
-	    elog "User-specified configure options are not set."
-	    elog "If needed, set GDAL_CONFIGURE_OPTS to enable grass support."
+		elog "User-specified configure options are not set."
+		elog "If needed, set GDAL_CONFIGURE_OPTS to enable grass support."
 	fi
 	python_set_active_version 2
 }
@@ -75,10 +77,11 @@ src_prepare() {
 	eaclocal
 	eautoconf
 
-	epatch "${FILESDIR}"/${PN}-1.4.2-datadir.patch \
-	    "${FILESDIR}"/${PN}-1.5.1-python-install.patch \
-	    "${FILESDIR}"/${PN}-1.6.0-swig-fix.patch \
-	    "${FILESDIR}"/${PN}-1.6.1-ruby-make.patch
+	epatch \
+		"${FILESDIR}"/${PN}-1.4.2-datadir.patch \
+		"${FILESDIR}"/${PN}-1.5.1-python-install.patch \
+		"${FILESDIR}"/${PN}-1.6.0-swig-fix.patch \
+		"${FILESDIR}"/${PN}-1.6.1-ruby-make.patch
 
 	[[ ${CHOST} == *-darwin* ]] \
 		&& epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
@@ -86,7 +89,6 @@ src_prepare() {
 }
 
 src_configure() {
-
 	local pkg_conf="${GDAL_CONFIGURE_OPTS}"
 	local use_conf=""
 
@@ -105,43 +107,44 @@ src_configure() {
 	fi
 
 	use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) \
-	    $(use_with gml xerces) $(use_with hdf5) $(use_with curl) \
-	    $(use_with postgres pg) $(use_with python) $(use_with ruby) \
-	    $(use_with threads) $(use_with fits cfitsio) $(use_with perl) \
-	    $(use_with sqlite sqlite3 ="${EPREFIX}"/usr) $(use_with geos) \
-	    $(use_with jpeg2k jasper) $(use_with odbc) $(use_enable debug)"
+	 $(use_with gml xerces) $(use_with hdf5) $(use_with curl) \
+	 $(use_with postgres pg) $(use_with python) $(use_with ruby) \
+	 $(use_with threads) $(use_with fits cfitsio) $(use_with perl) \
+	 $(use_with sqlite sqlite3 ="${EPREFIX}"/usr) $(use_with geos) \
+	 $(use_with jpeg2k jasper) $(use_with odbc) $(use_enable debug)"
 
 	# It can't find this
 	if use ogdi ; then
-	    use_conf="--with-ogdi=${EPREFIX}/usr ${use_conf}"
+		use_conf="--with-ogdi=${EPREFIX}/usr ${use_conf}"
 	fi
 
 	if use mysql ; then
-	    use_conf="--with-mysql=${EPREFIX}/usr/bin/mysql_config ${use_conf}"
+		use_conf="--with-mysql=${EPREFIX}/usr/bin/mysql_config ${use_conf}"
 	fi
 
 	if use gif ; then
-	    use_conf="--with-gif=internal ${use_conf}"
+		use_conf="--with-gif=internal ${use_conf}"
 	else
-	    use_conf="--with-gif=no ${use_conf}"
+		use_conf="--with-gif=no ${use_conf}"
 	fi
 
 	if use python ; then
-	    use_conf="--with-pymoddir=${EPREFIX}/$(python_get_sitedir) \
+		use_conf="--with-pymoddir=${EPREFIX}/$(python_get_sitedir) \
 		${use_conf}"
 	fi
 
 	# Fix doc path just in case
-	sed -i -e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
-	    GDALmake.opt.in || die "sed gdalmake.opt failed"
+	sed \
+		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
+		-i GDALmake.opt.in || die "sed gdalmake.opt failed"
 
 	econf ${pkg_conf} ${use_conf} || die "econf failed"
 
 	# mysql-config puts this in (and boy is it a PITA to get it out)
 	sed \
-	    -i -r -e '/^LDFLAGS/ s/(-(Wl|O1),|,-(Wl|O1))//g' \
-	    -i -e '/^MYSQL_LIB/ s:-Wl,-O1 -rdynamic::' \
-	    GDALmake.opt || die "sed LIBS failed"
+	 -i -r -e '/^LDFLAGS/ s/(-(Wl|O1),|,-(Wl|O1))//g' \
+	 -i -e '/^MYSQL_LIB/ s:-Wl,-O1 -rdynamic::' \
+	 GDALmake.opt || die "sed LIBS failed"
 }
 
 src_compile() {
@@ -159,75 +162,74 @@ src_compile() {
 	emake -j1 || die "emake failed"
 
 	if use python; then
-	    sed -i -e "s#library_dirs = #library_dirs = ${EPREFIX}/usr/$(get_libdir):#g" \
+	 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" \
+	 sed -i -e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
 		swig/python/GNUmakefile || die "sed python makefile failed"
 	fi
 
 	if use perl ; then
-	    cd "${S}"/swig/perl
-	    perl-module_src_prep
-	    perl-module_src_compile
-	    cd "${S}"
+		cd "${S}"/swig/perl
+		perl-module_src_prep
+		perl-module_src_compile
+		cd "${S}"
 	fi
 
 	if use doc ; then
-	    make docs || die "make docs failed"
+		make docs || die "make docs failed"
 	fi
 }
 
 src_install() {
-
 	if use perl ; then
-	    cd "${S}"/swig/perl
-	    perl-module_src_install
-	    sed -i -e "s:BINDINGS        =       python ruby perl:BINDINGS        =       python ruby:g" \
+		cd "${S}"/swig/perl
+		perl-module_src_install
+		sed -i -e "s:BINDINGS = python ruby perl:BINDINGS = python ruby:g" \
 		GDALmake.opt
-	    cd "${S}"
+		cd "${S}"
 	fi
 
 	# einstall causes sandbox violations on /usr/lib/libgdal.so
 	emake DESTDIR="${D}" install \
-	    || die "make install failed"
+	 || die "make install failed"
 
 	dodoc Doxyfile HOWTO-RELEASE NEWS
 
 	if use doc ; then
-	    dohtml html/* || die "install html failed"
-	    docinto ogr
-	    dohtml ogr/html/* || die "install ogr html failed"
+		dohtml html/* || die "install html failed"
+		docinto ogr
+		dohtml ogr/html/* || die "install ogr html failed"
 	fi
 
 	if use python; then
-	    newdoc swig/python/README.txt README-python.txt
-	    dodir /usr/share/${PN}/samples
-	    insinto /usr/share/${PN}/samples
-	    doins swig/python/samples/*
+	 newdoc swig/python/README.txt README-python.txt
+	 dodir /usr/share/${PN}/samples
+	 insinto /usr/share/${PN}/samples
+	 doins swig/python/samples/*
 	fi
 
 	use perl && fixlocalpod
 }
 
 pkg_postinst() {
-	elog
+	echo
 	elog "If you need libgrass support, then you must rebuild gdal, after"
 	elog "installing the latest Grass, and set the following option:"
-	elog
+	echo
 	elog "GDAL_CONFIGURE_OPTS=--with-grass=\$GRASS_HOME emerge gdal"
-	elog
+	echo
 	elog "GDAL is most useful with full graphics support enabled via various"
 	elog "USE flags: png, jpeg, gif, jpeg2k, etc. Also python, fits, ogdi,"
 	elog "geos, and support for either netcdf or HDF4 is available, as well as"
 	elog "grass, and mysql, sqlite, or postgres (grass support requires grass 6"
-	elog "and rebuilding gdal).  HDF5 support is now included."
-	elog
+	elog "and rebuilding gdal). HDF5 support is now included."
+	echo
 	elog "Note: tiff and geotiff are now hard depends, so no USE flags."
 	elog "Also, this package will check for netcdf before hdf, so if you"
 	elog "prefer hdf, please emerge hdf with USE=szip prior to emerging"
-	elog "gdal.  Detailed API docs require doxygen (man pages are free)."
-	elog
+	elog "gdal. Detailed API docs require doxygen (man pages are free)."
+	echo
 	elog "Check available image and data formats after building with"
 	elog "gdalinfo and ogrinfo (using the --formats switch)."
-	elog
+	echo
 }
diff --git a/sci-libs/gdal/gdal-1.8.0-r1.ebuild b/sci-libs/gdal/gdal-1.8.0-r1.ebuild
index 0b2f8779f89d..6a08dd8157b3 100644
--- a/sci-libs/gdal/gdal-1.8.0-r1.ebuild
+++ b/sci-libs/gdal/gdal-1.8.0-r1.ebuild
@@ -1,17 +1,19 @@
 # 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.8.0-r1.ebuild,v 1.4 2011/07/05 01:00:30 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.8.0-r1.ebuild,v 1.5 2011/07/16 17:45:45 jlec Exp $
 
-EAPI="2"
+EAPI=2
 
 WANT_AUTOCONF="2.5"
+
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby18"
+
 PYTHON_DEPEND="python? 2:2.6"
 
 inherit autotools eutils libtool perl-module python ruby-ng toolchain-funcs
 
-DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
 HOMEPAGE="http://www.gdal.org/"
 SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
 
diff --git a/sci-libs/gdal/metadata.xml b/sci-libs/gdal/metadata.xml
index 1216ac0a05c0..b89ac1d58457 100644
--- a/sci-libs/gdal/metadata.xml
+++ b/sci-libs/gdal/metadata.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-geosciences</herd>
-<maintainer>
-  <email>nerdboy@gentoo.org</email>
-  <name>Steve Arnold</name>
-  <description>Primary Maintainer</description>
-</maintainer>
-<longdescription>GDAL is the Geospatial Data Abstraction Library, a set of tools for
+	<herd>sci-geosciences</herd>
+	<maintainer>
+		<email>nerdboy@gentoo.org</email>
+		<name>Steve Arnold</name>
+		<description>Primary Maintainer</description>
+	</maintainer>
+	<longdescription>GDAL is the Geospatial Data Abstraction Library, a set of tools for
  converting between geospatial raster data formats (includes OGR for vector data).</longdescription>
-<use>
-  <flag name='aux_xml'>Enable Portable Auxilliary Metadata generation</flag>
-  <flag name='ecwj2k'>Enable support for alternate jpeg2k library
+	<use>
+		<flag name="aux_xml">Enable Portable Auxilliary Metadata generation</flag>
+		<flag name="ecwj2k">Enable support for alternate jpeg2k library
     <pkg>sci-libs/libecwj2</pkg></flag>
-  <flag name='fits'>Enable support for NASA's <pkg>sci-libs/cfitsio</pkg>
+		<flag name="fits">Enable support for NASA's <pkg>sci-libs/cfitsio</pkg>
     library</flag>
-  <flag name='geos'>Add support for geometry engine (<pkg>sci-libs/geos</pkg>
+		<flag name="geos">Add support for geometry engine (<pkg>sci-libs/geos</pkg>
     </flag>
-  <flag name='gml'>Enable support for <pkg>dev-libs/xerces-c</pkg> C++ API</flag>
-  <flag name='hdf'>Add support for the Hierarchical Data Format v. 4
+		<flag name="gml">Enable support for <pkg>dev-libs/xerces-c</pkg> C++ API</flag>
+		<flag name="hdf">Add support for the Hierarchical Data Format v. 4
     (<pkg>sci-libs/hdf</pkg>)</flag>
-  <flag name='ogdi'>Enable support for the open geographic datastore interface
+		<flag name="ogdi">Enable support for the open geographic datastore interface
     (<pkg>sci-libs/ogdi</pkg>)</flag>
-</use>
+	</use>
 </pkgmetadata>