Significant ebuild cleanup. Removed libproj option for now since this requires libproj4 which is currently missing from portage.

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

3 files changed, 14 insertions, 26 deletions

diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog
index 10793c278c2d..98ffa89d1c39 100644
--- a/dev-lang/gdl/ChangeLog
+++ b/dev-lang/gdl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/gdl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.16 2010/02/18 21:20:56 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.17 2010/02/27 04:33:54 markusle Exp $
+
+  27 Feb 2010; Markus Dittrich <markusle@gentoo.org> gdl-0.9_rc4.ebuild:
+  Significant ebuild cleanup. Removed libproj option for now since
+  this requires libproj4 which is currently missing from portage.
+  Thanks much to Sylwester Arabas for his help and support.
 
   18 Feb 2010; Sébastien Fabbro <bicatali@gentoo.org> gdl-0.9_rc4.ebuild:
   Adding an mpi hack when hdf5 has mpi support, see bug #302621
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index 21b6beca5125..3a30cdc96937 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gdl-0.9_rc1-gcc4.3.patch 1958 RMD160 478b337439cd34012a6ce4e082729c34a9247e5e SHA1 fa673c4630e77f507f22542445fd84741e9b9cfb SHA256 c03546e074b89a33ab45df21c0799da726789db107296a533822c09f3432b1d6
 AUX gdl-0.9_rc1-magick.patch 1008 RMD160 3190ee3213e060d493be516151d6eca7745560e2 SHA1 fc369e262d8f859df959277b1b367f5c93df410c SHA256 be3fefd9e66ad45f0480403b12831d0d7023c1ff519a0e6d03f2868d00bfd2bf
 AUX gdl-0.9_rc1-proj4.patch 1087 RMD160 222d10268dc3d99de76312a1e1ccef3b9f1af015 SHA1 4e4cb8e23421f73a2764bcc3ea259e9a45b0872f SHA256 cd903dd710c37a0f7ce4582625ba0339e6e16e6918dcc55b3b040e68ad3df4cf
@@ -13,13 +10,6 @@ DIST gdl-0.9rc3.tar.gz 1899718 RMD160 d5e47420462a200853fc6b33447181e477218368 S
 DIST gdl-0.9rc4.tar.gz 1486747 RMD160 504f072d4dbf30403a2e9e0ed18223537619f01a SHA1 ffd133b9bc213613c89952f341defb447a87bf1d SHA256 b4b6c64c0d6b208d0a1c577986740308b388ef31b6960cf6c9cc93618b8b97b2
 EBUILD gdl-0.9_rc2.ebuild 2572 RMD160 bbeecf52a18f58b8bd41fe6439763fbba8e2053a SHA1 65fb5917c65e80e7a5db2400e1a6a38b144fa283 SHA256 6777ca6ccde758c164e5aa646786200765471eca86de8dc5f9f716ddb46c7527
 EBUILD gdl-0.9_rc3.ebuild 2531 RMD160 c5a841936c78ee220c139441d72275182d0ff285 SHA1 077e8fe0df9d9301af19da35cdad3a0bed64f6c7 SHA256 3ab77be6e7478a29d6a4c493ce8ae239bd5fe8ed9ce26138c13bb9cd860209fc
-EBUILD gdl-0.9_rc4.ebuild 2408 RMD160 3351102f3778c27ed3b34145cffd9d99b1c4ed35 SHA1 184fbf1b8abc2e7e149f6b3a7c9401f95ee5d7a0 SHA256 6adb85f648d7410ee7e8633a526ce77f2c0d5838702426483f604d74a0c4e246
-MISC ChangeLog 3454 RMD160 51007370f8006e7a345f011456286130c46c4a33 SHA1 0fd493d5b6809c1bdaf91c3099ddadaf48902d6c SHA256 27892e72bdc5c62bde889fb01cd28bf581bc0d445d034faa6971005f1484c4b3
+EBUILD gdl-0.9_rc4.ebuild 2187 RMD160 06e30d34de86a085f57a8ae8a36a3e6e1d8e0291 SHA1 447f47bf1ccd45e4911617d3f2b3da1f65ca2e99 SHA256 17563937f9a67bf9b167b25a51fe3a73747def4ea26547f9fcaad6bae5de1532
+MISC ChangeLog 3721 RMD160 5a2b8007d2fa8f88fa14f0d302350f20338d4c74 SHA1 003aa8019a2ed2d18f32fe52694a0a37c36540ca SHA256 916bcd38fcba55533c681ce9d28684bb0fc8d02d94d2acfe5711cc7cf6a9b774
 MISC metadata.xml 626 RMD160 88f7a1519569b5dca8e3f1b8817c5d34a82e56f3 SHA1 9751e41c6656a74f9f0776f8f93edbef0f147392 SHA256 68cd2fff8c6ff4c79d58d36ea648bf133b90df9b579bb8f968ed3edce7a57bc4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkt9r0MACgkQ1ycZbhPLE2C75wCfUg0ZkJJO3Gsv7eVCj75lJxcS
-ofsAoJTXITTe/OQAkgEfYbRqT36G9jWa
-=AVLl
------END PGP SIGNATURE-----
diff --git a/dev-lang/gdl/gdl-0.9_rc4.ebuild b/dev-lang/gdl/gdl-0.9_rc4.ebuild
index ce3c70bc68b8..67de21c11613 100644
--- a/dev-lang/gdl/gdl-0.9_rc4.ebuild
+++ b/dev-lang/gdl/gdl-0.9_rc4.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/dev-lang/gdl/gdl-0.9_rc4.ebuild,v 1.2 2010/02/18 21:20:56 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_rc4.ebuild,v 1.3 2010/02/27 04:33:54 markusle Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/gnudatalanguage/${MYP}.tar.gz"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="python fftw hdf hdf5 netcdf imagemagick proj"
+IUSE="python fftw hdf hdf5 netcdf imagemagick"
 
 RDEPEND=">=sys-libs/readline-4.3
 	sci-libs/gsl
@@ -25,8 +25,7 @@ RDEPEND=">=sys-libs/readline-4.3
 	hdf5? ( sci-libs/hdf5 )
 	netcdf? ( sci-libs/netcdf )
 	python? ( dev-python/numarray dev-python/matplotlib )
-	fftw? ( >=sci-libs/fftw-3 )
-	proj? ( sci-libs/proj )"
+	fftw? ( >=sci-libs/fftw-3 )"
 
 DEPEND="${RDEPEND}
 	sys-devel/libtool"
@@ -35,7 +34,6 @@ S="${WORKDIR}/${MYP}"
 
 src_prepare() {
 	use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
-	epatch "${FILESDIR}"/${PN}-0.9_rc3-proj4.patch
 	epatch "${FILESDIR}"/${PN}-0.9_rc2-gcc4.4.patch
 	epatch "${FILESDIR}"/${P}-antlr.patch
 
@@ -44,6 +42,9 @@ src_prepare() {
 	# header files
 	rm -fr "${S}"/src/antlr || die "failed to remove antlr directory"
 
+	# adjust the *.pro file install path
+	sed -i -e "s:datasubdir=.*$:datasubdir=\"${PN}\":" configure.in \
+		|| die "Failed to fix *.pro install patch."
 	eautoreconf
 }
 
@@ -65,7 +66,6 @@ src_configure() {
 	  $(use_with hdf5) \
 	  $(use_with netcdf) \
 	  $(use_with imagemagick Magick) \
-	  $(use_with proj libproj4) \
 	  ${myconf} \
 	  || die "econf failed"
 
@@ -81,13 +81,6 @@ src_test() {
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
-	insinto /usr/share/${PN}
-	doins -r src/pro src/py || die "install pro and py files failed"
 	dodoc README PYTHON.txt AUTHORS ChangeLog NEWS TODO HACKING \
 		|| die "Failed to install docs"
-
-	# add GDL provided routines to IDL_PATH
-	echo "GDL_STARTUP=/usr/share/${PN}/pro" > 99gdl
-	echo "GDL_PATH=/usr/share/${PN}" >> 99gdl
-	doenvd 99gdl || die "doenvd failed"
 }