Removed old

(Portage version: 2.2_rc61/cvs/Linux x86_64)

5 files changed, 6 insertions, 204 deletions

diff --git a/sci-astronomy/celestia/ChangeLog b/sci-astronomy/celestia/ChangeLog
index 02ac9466d0cf..4c31d947c154 100644
--- a/sci-astronomy/celestia/ChangeLog
+++ b/sci-astronomy/celestia/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-astronomy/celestia
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.60 2010/01/11 22:13:49 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.61 2010/01/12 02:18:48 bicatali Exp $
+
+  12 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/celestia-1.4.1-cfg.patch, -celestia-1.5.1.ebuild,
+  -files/celestia-1.5.1-arts.patch, -files/celestia-1.5.1-kde-3.5.patch:
+  Removed old
 
   11 Jan 2010; Brent Baude <ranger@gentoo.org> celestia-1.6.0.ebuild:
   stable ppc64, bug 292956
diff --git a/sci-astronomy/celestia/celestia-1.5.1.ebuild b/sci-astronomy/celestia/celestia-1.5.1.ebuild
deleted file mode 100644
index 0a8b1fdf9fdc..000000000000
--- a/sci-astronomy/celestia/celestia-1.5.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2009 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.13 2009/11/12 19:37:27 bicatali Exp $
-
-EAPI=2
-inherit eutils flag-o-matic gnome2 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="cairo gnome gtk lua nls pch theora threads unicode"
-
-RDEPEND="virtual/glu
-	media-libs/jpeg
-	media-libs/libpng
-	gtk? ( !gnome? ( >=x11-libs/gtk+-2.6 >=x11-libs/gtkglext-1.0 ) )
-	gnome? (
-		>=x11-libs/gtk+-2.6
-		>=x11-libs/gtkglext-1.0
-		>=gnome-base/libgnomeui-2.0
-	)
-	!gtk? ( !gnome? ( virtual/glut ) )
-	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; then
-		einfo "USE=\"gnome\" detected."
-		USE_DESTDIR="1"
-		CELESTIA_GUI="gnome"
-	elif use gtk; then
-		einfo "USE=\"gtk\" detected."
-		CELESTIA_GUI="gtk"
-	else
-		ewarn "If you want to use the full gui, set USE=\"{gnome/gtk}\""
-		ewarn "Defaulting to glut support (no GUI)."
-		CELESTIA_GUI="glut"
-	fi
-}
-
-src_prepare() {
-	# 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
-
-	# needed for proper detection of kde-3.5 in the presence
-	# of kde4
-	epatch "${FILESDIR}"/${P}-kde-3.5.patch
-
-	# missing includes with gcc 4.4
-	epatch "${FILESDIR}"/${P}-gcc44.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
-	if use unicode; then
-		pushd locale > /dev/null
-		for i in guide_{de,es,fr,it,nl,sv}.cel start_de.cel demo_nl.cel; do
-			iconv -f iso-8859-1 ${i} -t utf8 > ${i}.utf8
-			mv ${i}.utf8 ${i}
-		done
-		iconv -f iso-8859-1 -t utf8 start_de.cel > start_de.cel.utf8
-		iconv -f cp1251 -t utf8 guide_ru.cel > guide_ru.cel.utf8
-		iconv -f SHIFT-JIS -t utf8 guide_ja.cel > guide_ja.cel.utf8
-		mv start_de.cel.utf8 start_de.cel
-		mv guide_ru.cel.utf8 guide_ru.cel
-		mv guide_ja.cel.utf8 guide_ja.cel
-		popd > /dev/null
-	fi
-	eautoreconf
-	filter-flags "-funroll-loops -frerun-loop-opt"
-}
-
-src_configure() {
-	econf \
-		--with-${CELESTIA_GUI} \
-		$(use_with lua) \
-		$(use_enable cairo) \
-		$(use_enable threads threading) \
-		$(use_enable nls) \
-		$(use_enable pch) \
-		$(use_enable theora)
-}
-
-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.4.1-cfg.patch b/sci-astronomy/celestia/files/celestia-1.4.1-cfg.patch
deleted file mode 100644
index 61e9419c2d89..000000000000
--- a/sci-astronomy/celestia/files/celestia-1.4.1-cfg.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- celestia.cfg.orig	2006-09-19 11:05:24.000000000 +0100
-+++ celestia.cfg	2006-09-19 11:05:50.000000000 +0100
-@@ -150,7 +150,7 @@
- # or
- #   ExtrasDirectories  [ "D:\\celestia-extras" ]
- #------------------------------------------------------------------------
--  ExtrasDirectories  [ "extras" ]
-+  ExtrasDirectories  [ "extras" "~/.celestia" ]
- 
- 
- #------------------------------------------------------------------------
diff --git a/sci-astronomy/celestia/files/celestia-1.5.1-arts.patch b/sci-astronomy/celestia/files/celestia-1.5.1-arts.patch
deleted file mode 100644
index 2f257a919901..000000000000
--- a/sci-astronomy/celestia/files/celestia-1.5.1-arts.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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])
-       
diff --git a/sci-astronomy/celestia/files/celestia-1.5.1-kde-3.5.patch b/sci-astronomy/celestia/files/celestia-1.5.1-kde-3.5.patch
deleted file mode 100644
index 472e78e711d6..000000000000
--- a/sci-astronomy/celestia/files/celestia-1.5.1-kde-3.5.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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-11-05 08:52:30.000000000 -0500
-@@ -1629,8 +1629,8 @@
- AC_MSG_CHECKING([for KDE])
- 
- if test "${prefix}" != NONE; then
--  kde_includes=${prefix}/include
--  ac_kde_includes=$prefix/include
-+  kde_includes=${prefix}/kde/3.5/include
-+  ac_kde_includes=$prefix/kde/3.5/include
- 
-   if test "${exec_prefix}" != NONE; then
-      kde_libraries=${libdir}
-@@ -1662,7 +1662,7 @@
- 
- if test -z "$1"; then
- 
--kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
-+kde_incdirs="/usr/kde/3.5/include $x_includes $qt_includes"
- test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
- kde_incdirs="$ac_kde_includes $kde_incdirs"
- AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)