Fixing the ACCESS VIOLATIONs, thanks go to Lars (Polynomial-C) <polynomial-C@gmx.de> for working on this, removing superceeded version

(Portage version: 2.1_pre5-r2)

7 files changed, 59 insertions, 108 deletions

diff --git a/sci-astronomy/celestia/ChangeLog b/sci-astronomy/celestia/ChangeLog
index 003cb68c6366..7fb9533c5ad6 100644
--- a/sci-astronomy/celestia/ChangeLog
+++ b/sci-astronomy/celestia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-astronomy/celestia
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.15 2006/03/15 17:02:03 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.16 2006/04/05 04:25:29 morfic Exp $
+
+  05 Apr 2006; Daniel Goller <morfic@gentoo.org> +files/makefile.am.patch,
+  -celestia-1.4.0.ebuild, celestia-1.4.1.ebuild:
+  Fixing the ACCESS VIOLATIONs, thanks go to Lars (Polynomial-C)
+  <polynomial-C@gmx.de> for working on this
+  Also removing superceeded version
 
   15 Mar 2006; Markus Rothe <corsair@gentoo.org> celestia-1.4.1.ebuild:
   Added ~ppc64; bug #126217
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 7701a0655c08..5a79fbf42cca 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -1,11 +1,39 @@
 MD5 a390d5f105c6f04ffce72b7a3c4ec771 ChangeLog 7466
+RMD160 dfb85608c47e48baafb5427f626baaa5e5eca86b ChangeLog 7466
+SHA256 444778d5b050b71b56ccbf1596148deb1e242b8aac8602f4ea5997675263cd8f ChangeLog 7466
+MD5 b0439310d72628968d08f772303bfc1c Manifest.asc 2907
+RMD160 34935806d3fa41bb342f68835a9350fcf84071b4 Manifest.asc 2907
+SHA256 232aa36c8aee37e0b61c766933a0f2a8a7c119e1453385891207ce1346a2d976 Manifest.asc 2907
 MD5 6be90f964bc6ca0195b0623338dfd1f0 celestia-1.3.2.ebuild 3063
+RMD160 3693e0d7a28a52d9445c9d92b3693f4ad190e7d3 celestia-1.3.2.ebuild 3063
+SHA256 36aec6cd0b0c6b33cfdc1bfe415b5d6cd2607a1ac89c6410b113ce2514cb5cbe celestia-1.3.2.ebuild 3063
 MD5 511913cb6dac5097274e61a8257fa1a5 celestia-1.4.0.ebuild 2943
-MD5 f0dee325cad8baaba0f153f64abb9aee celestia-1.4.1.ebuild 3052
+RMD160 86df3a5eed845422da99907dd737824e87a57c45 celestia-1.4.0.ebuild 2943
+SHA256 0b2b8133affce05a7cde09843407622a1968615faea75c362d45e58ae09476e1 celestia-1.4.0.ebuild 2943
+MD5 d586cf6781787b8527b4138661e6527a celestia-1.4.1.ebuild 3109
+RMD160 d4c205269ff8653025f0307963867fe4dbd7e682 celestia-1.4.1.ebuild 3109
+SHA256 439d5f34e154d3f512e4124668981ac8d8d6ba3dca8a29d3e23e65f30091d031 celestia-1.4.1.ebuild 3109
 MD5 f659f2616eeaaa4d3b6422e586d2bfa2 files/celestia-1.3.2-noarts.patch 3566
+RMD160 32cc8eacfe3cd571d8d16ab99730436e98033e6e files/celestia-1.3.2-noarts.patch 3566
+SHA256 d6e58016dca095d949b6492aeb12fa8b881ae1b47ac2858ff89f20b393b912ad files/celestia-1.3.2-noarts.patch 3566
 MD5 5f63556bba262455321ec2a466ef3bf8 files/celestia-1.4.1-gcc-4.1.patch 1191
+RMD160 b9bfae5bc1b5bf93a95760e3fd558645668cdca6 files/celestia-1.4.1-gcc-4.1.patch 1191
+SHA256 ea26fe154cf92c613c54edd5e0e51c1b8562ee5ccd74ab191a8a386cd8986e67 files/celestia-1.4.1-gcc-4.1.patch 1191
 MD5 d4ff8e51fb3a546279e7442cf24e07d7 files/digest-celestia-1.3.2 68
+RMD160 1ee0c8d835557d2f14c2b4c5689934975c5e2a84 files/digest-celestia-1.3.2 68
+SHA256 3a8b183f8ff6e80549e206c4586934cdcdee1f47745a8fc55658926ce5d43404 files/digest-celestia-1.3.2 68
 MD5 8e1dfea9c274b2242b921a467ec1d54b files/digest-celestia-1.4.0 68
-MD5 c5a1e667a20a16f4aef1d1772bee8762 files/digest-celestia-1.4.1 68
+RMD160 78d294bf21394de3d099bf54b80418353ca9a96f files/digest-celestia-1.4.0 68
+SHA256 9227be756baf3edf7163b08ba9cbf31d02edbccb04bba98e90ecda2a7e02bc94 files/digest-celestia-1.4.0 68
+MD5 34161bf1fac09b84a3ffe3d187aa811d files/digest-celestia-1.4.1 250
+RMD160 b55d9c21cfda86365a1be8dcf84705ca0381ac9a files/digest-celestia-1.4.1 250
+SHA256 d638e17dad65f179f89102c209ecffc06c9383a96420f7a9c31a9cabba357fdf files/digest-celestia-1.4.1 250
+MD5 73a7b2bf8c20c6bb26e3dd39db5583ad files/makefile.am.patch 684
+RMD160 a52c92b13ea2dc706f93b0ea7a0db0c86d24b574 files/makefile.am.patch 684
+SHA256 16a68c52bb2e992afc2eb3c96b252c4597b675772112a5bb2eac6efc58d964b2 files/makefile.am.patch 684
 MD5 f96a6eb019a59bf1a643b96c43657af8 files/resmanager.h.patch 893
+RMD160 e6917203264b7a544f05ed0622955bef3bbe328a files/resmanager.h.patch 893
+SHA256 41164fb00e673f9277dad12f19721ab3dfcda0dc2e7de1b0ca7c9cb86a1786c5 files/resmanager.h.patch 893
 MD5 1b55bd73a1313e288a88762af6cd0fb7 metadata.xml 330
+RMD160 536bf8245e499cf71b58fcdcd1f0fffe69803f16 metadata.xml 330
+SHA256 291517a872db6b61a0a890151a65ad52dfca7f470137307b122f290e5e519f44 metadata.xml 330
diff --git a/sci-astronomy/celestia/celestia-1.4.0.ebuild b/sci-astronomy/celestia/celestia-1.4.0.ebuild
deleted file mode 100644
index bfcb40623067..000000000000
--- a/sci-astronomy/celestia/celestia-1.4.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.4.0.ebuild,v 1.7 2006/02/16 03:52:17 morfic Exp $
-
-inherit eutils flag-o-matic gnome2 kde-functions
-
-DESCRIPTION="Free space simulation that lets you experience our universe in three dimensions"
-HOMEPAGE="http://www.shatters.net/celestia/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="gnome gtk kde arts threads nls lua"
-
-DEPEND="virtual/glu
-	media-libs/jpeg
-	media-libs/libpng
-	gtk? ( !gnome? ( !kde? (
-		>=x11-libs/gtk+-2.6
-		>=x11-libs/gtkglext-1.0
-	) ) )
-	gnome? ( !kde? (
-		>=x11-libs/gtk+-2.6
-		>=x11-libs/gtkglext-1.0
-		>=gnome-base/libgnomeui-2.0
-	) )
-	kde?  ( !gnome? ( >=kde-base/kdelibs-3.0.5 ) )
-	!gtk? ( !gnome? ( !kde? ( virtual/glut ) ) )
-	arts? ( kde-base/arts )
-	lua? ( >=dev-lang/lua-5.0 )"
-
-pkg_setup() {
-	# Check for one for the following use flags to be set.
-	if ! use gnome && use kde; then
-		einfo "USE=\"kde\" detected."
-		mygui="kde"
-	elif ! use kde && use gnome; then
-		einfo "USE=\"gnome\" detected."
-		USE_DESTDIR="1"
-		mygui="gnome"
-	elif ! use kde && ! use gnome && use gtk; then
-		einfo "USE=\"gtk\" detected."
-		mygui="gtk"
-	elif use kde && use gnome; then
-		einfo "Both gnome and kde support requested. Defaulting to kde"
-		mygui="kde"
-	else
-		ewarn "If you want to use the full gui, set USE=\"{kde/gnome/gtk}\""
-		ewarn "Defaulting to glut support (no GUI)."
-		mygui="glut"
-	fi
-
-	einfo "If you experience problems building celestia with nvidia drivers,"
-	einfo "you can try:"
-	einfo "eselect opengl set xorg-x11"
-	einfo "emerge celestia"
-	einfo "eselect opengl set nvidia"
-}
-
-src_compile() {
-	filter-flags "-funroll-loops -frerun-loop-opt"
-	addwrite ${QTDIR}/etc/settings
-
-	# remove manual installation in /usr/share/${PN}/manual
-	# replaced with dohtml in src_install
-	sed -i -e "s:manual::g" Makefile.in
-
-	if [ "${mygui}" == "kde" ]; then
-		set-kdedir 3
-		set-qtdir 3
-		export kde_widgetdir="$KDEDIR/lib/kde3/plugins/designer"
-	fi
-
-	econf \
-		--with-${mygui} \
-		--with-pic \
-		$(use_with arts) \
-		$(use_with lua) \
-		$(use_enable threads threading) \
-		$(use_enable nls) \
-		|| die "econf failed"
-
-	#fix Makefiles to avoid Access Violations while fixing bug #119339
-	if [ "${mygui}" != "gnome" ] ; then
-	for d in . src data extras textures textures/lores textures/medres textures/hires models shaders fonts  po ; do
-	sed -i -e "s#pkgdatadir = /usr/share/celestia#pkgdatadir = ${D}/usr/share/celestia#" $d/Makefile; done
-	fi
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	if [ "${mygui}" == "gnome" ]; then
-		gnome2_src_install
-	else
-		einstall	|| die "einstall failed"
-	fi
-
-	dodoc AUTHORS README TODO NEWS TRANSLATORS ChangeLog \
-		CelestiaKeyAssignments.txt KbdMouseJoyControls.txt devguide.txt
-	dohtml coding-standards.html manual/*.html manual/*.css
-}
diff --git a/sci-astronomy/celestia/celestia-1.4.1.ebuild b/sci-astronomy/celestia/celestia-1.4.1.ebuild
index 91f530800028..a347ec9364d1 100644
--- a/sci-astronomy/celestia/celestia-1.4.1.ebuild
+++ b/sci-astronomy/celestia/celestia-1.4.1.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/sci-astronomy/celestia/celestia-1.4.1.ebuild,v 1.4 2006/03/15 17:02:03 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.4.1.ebuild,v 1.5 2006/04/05 04:25:29 morfic Exp $
 
 inherit eutils flag-o-matic gnome2 kde-functions
 
@@ -73,10 +73,12 @@ src_compile() {
 	fi
 
 	epatch "${FILESDIR}/celestia-1.4.1-gcc-4.1.patch"
+	epatch "${FILESDIR}/makefile.am.patch"
 
 	econf \
 		--with-${mygui} \
 		--with-pic \
+		--enable-pch \
 		$(use_with arts) \
 		$(use_with lua) \
 		$(use_enable threads threading) \
diff --git a/sci-astronomy/celestia/files/digest-celestia-1.4.0 b/sci-astronomy/celestia/files/digest-celestia-1.4.0
deleted file mode 100644
index 7b0b11dcac87..000000000000
--- a/sci-astronomy/celestia/files/digest-celestia-1.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d4bd0029af87fdd9cb4a0828cf62a025 celestia-1.4.0.tar.gz 25044420
diff --git a/sci-astronomy/celestia/files/digest-celestia-1.4.1 b/sci-astronomy/celestia/files/digest-celestia-1.4.1
index 24f4358f286b..b75d1f3ff9d0 100644
--- a/sci-astronomy/celestia/files/digest-celestia-1.4.1
+++ b/sci-astronomy/celestia/files/digest-celestia-1.4.1
@@ -1 +1,3 @@
 MD5 be1d36fc97a13b9a276249dbc0efac41 celestia-1.4.1.tar.gz 23966886
+RMD160 c66c2540e329613dace12e5b12b2dae2a4c679e0 celestia-1.4.1.tar.gz 23966886
+SHA256 f9dc34dbc0d53e98534000545802b5ab4a471c3cb3fa08a9c958cbbbeb28d8b5 celestia-1.4.1.tar.gz 23966886
diff --git a/sci-astronomy/celestia/files/makefile.am.patch b/sci-astronomy/celestia/files/makefile.am.patch
new file mode 100644
index 000000000000..fb02cb6bc478
--- /dev/null
+++ b/sci-astronomy/celestia/files/makefile.am.patch
@@ -0,0 +1,17 @@
+--- Makefile.am.old	2006-03-31 14:56:53.000000000 +0200
++++ Makefile.am	2006-03-31 16:32:21.370713472 +0200
+@@ -66,11 +66,7 @@
+ 	)
+ 
+ install-data-hook:
+-	if [ "$(kde_datadir)" -a -d $(kde_datadir)/@PACKAGE@ -a ! -h $(kde_datadir)/@PACKAGE@ ] ; then \
+-		mv -f -b $(kde_datadir)/@PACKAGE@/* $(datadir)/@PACKAGE@/ ; \
+-		rmdir $(kde_datadir)/@PACKAGE@ ; \
+-	fi
+-	if [ "$(kde_datadir)" -a ! -h $(kde_datadir)/@PACKAGE@ ] ; then \
+-		ln -s $(datadir)/@PACKAGE@ $(kde_datadir)/@PACKAGE@ ; \
+-	fi
++		mv -f -b $(DESTDIR)$(kde_datadir)/@PACKAGE@/* $(DESTDIR)$(datadir)/@PACKAGE@/ ; \
++		rmdir $(DESTDIR)$(kde_datadir)/@PACKAGE@ ; \
++		ln -s $(datadir)/@PACKAGE@ $(DESTDIR)$(kde_datadir) ;
+