Version bump, including fix for libtool-2.2 problems (bug #228865 and #218982).

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-SENTINEL-3 i686

4 files changed, 190 insertions, 12 deletions

diff --git a/sci-astronomy/celestia/ChangeLog b/sci-astronomy/celestia/ChangeLog
index 3bd33a33e843..596be9016596 100644
--- a/sci-astronomy/celestia/ChangeLog
+++ b/sci-astronomy/celestia/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-astronomy/celestia
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.40 2008/04/15 15:52:53 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.41 2008/06/24 17:20:03 markusle Exp $
+
+*celestia-1.5.1 (24 Jun 2008)
+
+  24 Jun 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/celestia-1.5.1-arts.patch, +celestia-1.5.1.ebuild:
+  Version bump, including fix for libtool-2.2 problems (bug #228865 
+  and #218982). Thanks much to Aleksandr Yakimov <aleks@spamtest.ru> 
+  for his patches.
 
   15 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org>
   +files/celestia-1.5.0-gcc43.patch, celestia-1.5.0.ebuild:
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 45cf2c760bce..1d5ceb163135 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX celestia-1.4.1-3dsmodels.patch 339 RMD160 a7a8dccf16476dc735c8af2fdea99bd5170f5e7a SHA1 4fa3fa941c944579955be460350aeb26ec329ae2 SHA256 79ae1fabb8b9f5683d483fb74975ea04576cd27d4c8e8a159119e8d85fe61dde
 AUX celestia-1.4.1-as-needed.patch 406 RMD160 3d466263828351e668858ab0d3d66219fa6d2e91 SHA1 5263f2815101e2f417e6c94402365fa1f705cd90 SHA256 369e0a679fba546d85bc8ab41abe72180568f210c55f333dc5c67b38a1e5e705
 AUX celestia-1.4.1-cfg.patch 425 RMD160 58ee9017aa389ffd0aa3eeafa2760e8470f8190c SHA1 20183c664d0c62b2e04c0f0ca09eb59c80b4da13 SHA256 5f3ac8eba91d5491d8500c7f25b2c324d03e9a6a6d5641a1ba62086ddca0d374
@@ -13,16 +10,14 @@ AUX celestia-1.4.1-lua51.patch 2351 RMD160 8c16ce1594bb789521c07c8a14e3738676ca8
 AUX celestia-1.4.1-strictalias.patch 367 RMD160 b3f79ab12e78d742adb9e8e6f71d4df25b444404 SHA1 a0623106c9428522982429f281e844d9d7f5c98f SHA256 f38398fef7dd604669e84e46ffe1cbe6514ada92f581b5b30ac0965223d3db54
 AUX celestia-1.5.0-desktop.patch 1594 RMD160 04ef01761f3aee6448ee60e06bb6ea508c0920e6 SHA1 5b739ac3b53bf5d8d3d74188b8ad650c6fdc165c SHA256 2f989391f775e3435f0e0e570f747e0d8f38b310ea8ad92ba75099c59203171d
 AUX celestia-1.5.0-gcc43.patch 35614 RMD160 9682b9f8649e03b6d03235fc16861c6be542ab09 SHA1 01ef7da008d2f1748f6aa76b12f087e3dca442ce SHA256 273e57141e3056da5b4a322c6506ef98f6794f7b6963594d5c5840efc2f9b7d1
+AUX celestia-1.5.1-arts.patch 1806 RMD160 af88ff314193c55d56223489f53d46125ea5073d SHA1 d98a9f4b9d7c376922f93243c39fab4cbb5a1ac7 SHA256 ff4bdca96577babaf90df1c965bb67f5cf32dbde527ba2644431e8c29ae87ce3
 DIST celestia-1.4.1.tar.gz 23966886 RMD160 c66c2540e329613dace12e5b12b2dae2a4c679e0 SHA1 37863498c43d3078b41027706bfa033bccd949a9 SHA256 f9dc34dbc0d53e98534000545802b5ab4a471c3cb3fa08a9c958cbbbeb28d8b5
 DIST celestia-1.5.0.tar.gz 29116952 RMD160 fe187c8964eac7832982a268a3a7b765807e8005 SHA1 cb761270f048193ab01159cab14082f25113cdaa SHA256 a07834ee5b1bb4be76c29086b0b7faec8c3baafa21bace8ccd765bae632473e0
+DIST celestia-1.5.1-acinclude.patch.bz2 37015 RMD160 dd4e2d538bf633bee691b6ece0a9381e5643bb2a SHA1 b11454a7d1c8bc8c472337c8a0728cf711d98f3c SHA256 b4ccd6a5c24e0074c698bc7d000e6193d182c3908a130a7da2d727a63d1d28b9
+DIST celestia-1.5.1-gcc43.patch.bz2 4673 RMD160 8aafd3ea0e93965398ff5493865e2632b65d1fcd SHA1 5237b4799c133d44af0d44c14ad6a9a4b5066003 SHA256 070c812969562948314a784e549c423634fc4eece990e820313682417fdb1fc8
+DIST celestia-1.5.1.tar.gz 34144780 RMD160 26f105acfc26a5edccb73fe29c33638804b0f370 SHA1 2d6a117daf6a400ab4c47a5a51c13f2ab601e6db SHA256 5a028dec634c2fd1b2097eb6717f8e6ca5d05052b7f63f5fc205d0cbf254888c
 EBUILD celestia-1.4.1-r2.ebuild 3961 RMD160 ddaebb358e6be735c88c5fd3284824f5a695403b SHA1 5ac13316c202b92a403c4382ebbf5fabd5e1ba6c SHA256 6dea08a53a09f70422a8e72310bcfa63dd1f84f77e721abfa902021c6a5c67be
 EBUILD celestia-1.5.0.ebuild 3355 RMD160 ad92950230d7348aa778a727dbc36e3ae05c79c4 SHA1 11a5e3a6ef9f2024fff7a66fe5f34f0e86125cf0 SHA256 2dfa1c81c329b3a6083dca91a5b591fd6976c253f52a72b8c5a4ed5e16b2a6cd
-MISC ChangeLog 11838 RMD160 18bc2ad5175a0295fe76b7fb7b7c405ed6a1da35 SHA1 0e069f900be3e14d70e4a6e225e89772ccce3759 SHA256 faf2938809295ca111481a70c14e1ef1f316e6916327a73a0ab1cf7f0c359069
+EBUILD celestia-1.5.1.ebuild 3604 RMD160 7aabf3191c9632a72d870bdad4da5b35df743d40 SHA1 f191fbbff3474ebf663695aa849373de3a64da42 SHA256 89c2ba83cb47914207377d821ed931872c7f63c180de0e704c175e5e78f8d5a8
+MISC ChangeLog 12141 RMD160 0be5ffb35b2b00f32dc2354804c4ed17cc6d96a8 SHA1 85e5bdf0835368ba2f6ce046af9e7e9d252458b9 SHA256 9f1da8ac8d4fcc476e8c9047016e59160ecade6ee8776f0547c33dbce5103309
 MISC metadata.xml 693 RMD160 902eac97368b5aa5d76c277826e42c3d741e9f99 SHA1 d5e786e1754e130bf4c0ff6d6978fb99ccb5f516 SHA256 3081606dbc2705ae14a2e9a9be830925eefc64bf2426bfee13399cc938e588da
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFIBM9q1ycZbhPLE2ARAguZAJ9I8LckKafjpV9UMv8Bi+2kzDYvWQCgpufL
-+L+ZokEw4eGCsLOCwokgbFk=
-=TkCY
------END PGP SIGNATURE-----
diff --git a/sci-astronomy/celestia/celestia-1.5.1.ebuild b/sci-astronomy/celestia/celestia-1.5.1.ebuild
new file mode 100644
index 000000000000..65f7dd08e7ce
--- /dev/null
+++ b/sci-astronomy/celestia/celestia-1.5.1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.5.1.ebuild,v 1.1 2008/06/24 17:20:03 markusle Exp $
+
+inherit eutils flag-o-matic gnome2 kde-functions autotools
+
+DESCRIPTION="OpenGL 3D space simulator"
+HOMEPAGE="http://www.shatters.net/celestia/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+		mirror://gentoo/${P}-acinclude.patch.bz2
+		mirror://gentoo/${P}-gcc43.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="arts cairo gnome gtk kde lua nls pch theora threads"
+
+RDEPEND="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 )
+	cairo? ( x11-libs/cairo )
+	theora? ( media-libs/libtheora )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	# Check for one for the following use flags to be set.
+
+	if ! use gnome && use kde; then
+		einfo "USE=\"kde\" detected."
+		CELESTIA_GUI="kde"
+	elif ! use kde && use gnome; then
+		einfo "USE=\"gnome\" detected."
+		USE_DESTDIR="1"
+		CELESTIA_GUI="gnome"
+	elif ! use kde && ! use gnome && use gtk; then
+		einfo "USE=\"gtk\" detected."
+		CELESTIA_GUI="gtk"
+	elif use kde && use gnome; then
+		einfo "Both gnome and kde support requested. Defaulting to kde"
+		CELESTIA_GUI="kde"
+	else
+		ewarn "If you want to use the full gui, set USE=\"{kde/gnome/gtk}\""
+		ewarn "Defaulting to glut support (no GUI)."
+		CELESTIA_GUI="glut"
+	fi
+}
+
+src_unpack() {
+
+	unpack ${A}
+	cd "${S}"
+	# make better desktop files
+	epatch "${FILESDIR}"/${PN}-1.5.0-desktop.patch
+
+	# add a ~/.celestia for extra directories
+	epatch "${FILESDIR}"/${PN}-1.4.1-cfg.patch
+
+	# fix for as-needed (bug #130091)
+	epatch "${FILESDIR}"/${PN}-1.4.1-as-needed.patch
+
+	# fix for as-needed (bug #217758)
+	epatch "${DISTDIR}"/${P}-gcc43.patch.bz2
+
+	# fix for libtool-2.2 (bug #228865 and #218982)
+	epatch "${DISTDIR}"/${P}-acinclude.patch.bz2
+
+	# needed for kde GUI
+	epatch "${FILESDIR}"/${P}-arts.patch
+
+	# remove flags to let the user decide
+	for cf in -O2 -ffast-math \
+		-fexpensive-optimizations \
+		-fomit-frame-pointer; do
+		sed -i \
+			-e "s/${cf}//g" \
+			configure.in || die "sed failed"
+	done
+
+	# remove an unused gconf macro killing autoconf when no gnome
+	# (not needed without eautoreconf)
+	if ! use gnome; then
+		sed -i \
+			-e '/AM_GCONF_SOURCE_2/d' \
+			configure.in || die "sed failed"
+	fi
+
+	eautoreconf
+}
+
+src_compile() {
+
+	if [[ ${CELESTIA_GUI} == kde ]]; then
+		set-kdedir 3
+		set-qtdir 3
+		export kde_widgetdir="${KDEDIR}/lib/kde3/plugins/designer"
+	fi
+
+	filter-flags "-funroll-loops -frerun-loop-opt"
+
+	econf \
+		--with-${CELESTIA_GUI} \
+		$(use_with arts) \
+		$(use_with lua) \
+		$(use_enable cairo) \
+		$(use_enable threads threading) \
+		$(use_enable nls) \
+		$(use_enable pch) \
+		$(use_enable theora) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	if [[ ${CELESTIA_GUI} == gnome ]]; then
+		gnome2_src_install
+	else
+		emake DESTDIR="${D}" install || die "emake install failed"
+		for size in 16 22 32 48 ; do
+			insinto /usr/share/icons/hicolor/${size}x${size}/apps
+			newins "${S}"/src/celestia/kde/data/hi${size}-app-${PN}.png ${PN}.png
+		done
+	fi
+	[[ ${CELESTIA_GUI} == glut ]] && domenu celestia.desktop
+	dodoc AUTHORS README TODO TRANSLATORS *.txt || die
+}
diff --git a/sci-astronomy/celestia/files/celestia-1.5.1-arts.patch b/sci-astronomy/celestia/files/celestia-1.5.1-arts.patch
new file mode 100644
index 000000000000..2f257a919901
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.5.1-arts.patch
@@ -0,0 +1,34 @@
+diff -Naur celestia-1.5.1/acinclude.m4 celestia-1.5.1.new/acinclude.m4
+--- celestia-1.5.1/acinclude.m4	2008-04-23 17:18:48.000000000 -0400
++++ celestia-1.5.1.new/acinclude.m4	2008-06-24 10:00:53.000000000 -0400
+@@ -522,6 +522,15 @@
+ 
+ AC_DEFUN(KDE_SUBST_PROGRAMS,
+ [
++    AC_ARG_WITH(arts,
++        AC_HELP_STRING([--without-arts],[build without aRts [default=no]]),
++        [build_arts=$withval],
++        [build_arts=yes]
++    )
++    AM_CONDITIONAL(include_ARTS, test "$build_arts" '!=' "no")
++    if test "$build_arts" = "no"; then
++        AC_DEFINE(WITHOUT_ARTS, 1, [Defined if compiling without arts])
++    fi
+ 
+         kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
+         test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
+@@ -536,8 +545,12 @@
+         kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_default_bindirs"
+         KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
+         KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])
+-        KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
+-        KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
++
++        if test "$build_arts" '!=' "no"; then
++            KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
++            KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
++        fi
++
+         KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs])
+         KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
+