From: Daniel Goller Date: Tue, 30 Nov 2004 00:48:58 +0000 (+0000) Subject: Out with the brokenness X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d82eaa05c511ffd254e738c9773d082bbd1e2c82;p=gentoo.git Out with the brokenness --- diff --git a/app-sci/celestia/ChangeLog b/app-sci/celestia/ChangeLog index 9363abaef15c..f1591ec15557 100644 --- a/app-sci/celestia/ChangeLog +++ b/app-sci/celestia/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-sci/celestia # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-sci/celestia/ChangeLog,v 1.24 2004/11/28 10:39:06 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-sci/celestia/ChangeLog,v 1.25 2004/11/30 00:48:58 morfic Exp $ + + 29 Nov 2004; Daniel Goller + -files/celestia-1.3.1-gtkmain.patch, -files/celestia-gcc3.patch, + -celestia-1.3.0-r1.ebuild, -celestia-1.3.0.ebuild, -celestia-1.3.1.ebuild: + Cleaning up all the old/broken ebuilds and their files. 28 Nov 2004; Simon Stelling celestia-1.3.2.ebuild: stable on amd64 diff --git a/app-sci/celestia/Manifest b/app-sci/celestia/Manifest index f2615388e6e2..8f39c72518c5 100644 --- a/app-sci/celestia/Manifest +++ b/app-sci/celestia/Manifest @@ -1,14 +1,16 @@ -MD5 474aa6a2d81502c0c7ef9d90792f42da ChangeLog 5141 -MD5 d1c4fd45b5434699053e79bca0e3b56b celestia-1.3.0-r1.ebuild 2210 -MD5 b9f19d3e0e4c91481aedb79f76ee203b celestia-1.3.0.ebuild 2087 -MD5 7a7c44ddc73bf924e3e6945afeb234be celestia-1.3.1.ebuild 2296 -MD5 a8fd623fbee6bf3e985ba63d7c7054d4 celestia-1.3.2.ebuild 3103 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 8a447b320f0e8f6c0340fc819badf10e ChangeLog 5394 MD5 1b55bd73a1313e288a88762af6cd0fb7 metadata.xml 330 -MD5 48aea4af15487f0c322ff982360d7ee8 files/celestia-1.3.1-gtkmain.patch 2501 -MD5 318b4452af1f7b12deb515e84ca6848a files/celestia-gcc3.patch 4576 -MD5 95f9f0d84c71195fe1f00ba37ea79c0e files/digest-celestia-1.3.0 68 -MD5 95f9f0d84c71195fe1f00ba37ea79c0e files/digest-celestia-1.3.0-r1 68 -MD5 03b2de07240ae616efd0d19d150b65bb files/digest-celestia-1.3.1 68 -MD5 d4ff8e51fb3a546279e7442cf24e07d7 files/digest-celestia-1.3.2 68 +MD5 a8fd623fbee6bf3e985ba63d7c7054d4 celestia-1.3.2.ebuild 3103 MD5 f96a6eb019a59bf1a643b96c43657af8 files/resmanager.h.patch 893 MD5 f659f2616eeaaa4d3b6422e586d2bfa2 files/celestia-1.3.2-noarts.patch 3566 +MD5 d4ff8e51fb3a546279e7442cf24e07d7 files/digest-celestia-1.3.2 68 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.6 (GNU/Linux) + +iD8DBQFBq8OLUpKYMelfdYERAlorAJ9yuOWS5wRCtGqAZwfdeMJs6LFY7wCfWjYu +rN5lVEO127HjWU2aSQTAdQw= +=Rxru +-----END PGP SIGNATURE----- diff --git a/app-sci/celestia/celestia-1.3.0-r1.ebuild b/app-sci/celestia/celestia-1.3.0-r1.ebuild deleted file mode 100644 index 3c71e4841d65..000000000000 --- a/app-sci/celestia/celestia-1.3.0-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-sci/celestia/celestia-1.3.0-r1.ebuild,v 1.7 2004/11/16 08:40:52 phosphan Exp $ - -inherit flag-o-matic kde-functions - -IUSE="kde gnome" - -DESCRIPTION="Celestia is a free real-time space simulation that lets you experience our universe in three dimensions" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -HOMEPAGE="http://www.shatters.net/celestia" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~x86 ~ppc ~amd64" - -# gnome and kde interfaces are exlcusive -DEPEND=">=media-libs/glut-3.7-r2 - virtual/glu - media-libs/jpeg - media-libs/libpng - !kde? ( gnome? ( =x11-libs/gtk+-1.2* - =gnome-base/gnome-libs-1.4* - =kde-base/kdelibs-3.0.5 )" - -pkg_setup() { - # Set up X11 implementation - X11_IMPLEM_P="$(portageq best_version "${ROOT}" virtual/x11)" - X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}" - X11_IMPLEM="${X11_IMPLEM##*\/}" - - einfo "Please note:" - einfo "if you experience problems building celestia with nvidia drivers," - einfo "you can try:" - einfo "opengl-update ${X11_IMPLEM}" - einfo "emerge celestia" - einfo "opengl-update nvidia" - einfo "" - einfo "NOTE: the gnome and kde GUIs are mutually exclusive, kde is" - einfo "recommended. If you're getting the wrong one, run either:" - einfo "'USE=\"gnome -kde\" emerge celestia' (for the gnome interface)" - einfo "or:" - einfo "'USE=\"kde\" emerge celestia' (for the kde interface)" - einfo "as appropriate." -} - -src_compile() { - local myconf - - filter-flags "-funroll-loops -frerun-loop-opt" - addwrite ${QTDIR}/etc/settings - # currently celestia's "gtk support" requires gnome - if use kde ; then - myconf="$myconf --with-kde --without-gtk" - elif use gnome ; then - myconf="--without-kde --with-gtk" - else - myconf="--without-kde --without-gtk" - # fix for badly written configure script - set-kdedir 3 - set-qtdir 3 - export kde_widgetdir="$KDEDIR/lib/kde3/plugins/designer" - fi - - ./configure --prefix=/usr ${myconf} || die - - emake all || die -} - -src_install() { - make install prefix=${D}/usr - - dodoc AUTHORS COPYING NEWS README TODO controls.txt - dohtml manual/*.html manual/*.css -} diff --git a/app-sci/celestia/celestia-1.3.0.ebuild b/app-sci/celestia/celestia-1.3.0.ebuild deleted file mode 100644 index 63f4fc9de574..000000000000 --- a/app-sci/celestia/celestia-1.3.0.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-sci/celestia/celestia-1.3.0.ebuild,v 1.5 2004/11/16 08:40:52 phosphan Exp $ - -inherit flag-o-matic kde-functions - -IUSE="gnome" - -DESCRIPTION="Celestia is a free real-time space simulation that lets you experience our universe in three dimensions" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -HOMEPAGE="http://www.shatters.net/celestia" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="x86 ~ppc" - -# gnome and kde interfaces are exlcusive; gnome takes precedence -DEPEND=">=media-libs/glut-3.7-r2 - virtual/glu - media-libs/jpeg - media-libs/libpng - gnome? ( =x11-libs/gtk+-1.2* - =kde-base/kdelibs-3.0.5 )" - -pkg_setup() { - # Set up X11 implementation - X11_IMPLEM_P="$(portageq best_version "${ROOT}" virtual/x11)" - X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}" - X11_IMPLEM="${X11_IMPLEM##*\/}" - - einfo "Please note:" - einfo "if you experience problems building celestia with nvidia drivers," - einfo "you can try:" - einfo "opengl-update ${X11_IMPLEM}" - einfo "emerge celestia" - einfo "opengl-update nvidia" - einfo "" - einfo "NOTE: the gnome and kde GUIs are mutually exclusive. If you're getting" - einfo "the wrong one, run either:" - einfo "'USE=gnome emerge celestia' (for the gnome interface)" - einfo "or:" - einfo "'USE=-gnome emerge celestia' (for the kde interface)" - einfo "as appropriate." -} - -src_compile() { - local myconf - - filter-flags "-funroll-loops -frerun-loop-opt" - - # currently celestia's "gtk support" requires gnome - if use gnome; then - myconf="$myconf --with-gtk --without-kde" - else - myconf="--with-kde --without-gtk" - # fix for badly written configure script - set-kdedir 3 - set-qtdir 3 - export kde_widgetdir="$KDEDIR/lib/kde3/plugins/designer" - fi - - ./configure --prefix=/usr ${myconf} || die - - emake all || die -} - -src_install() { - make install prefix=${D}/usr - - dodoc AUTHORS COPYING NEWS README TODO controls.txt - dohtml manual/*.html manual/*.css -} diff --git a/app-sci/celestia/celestia-1.3.1.ebuild b/app-sci/celestia/celestia-1.3.1.ebuild deleted file mode 100644 index 2c1097f36dc7..000000000000 --- a/app-sci/celestia/celestia-1.3.1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-sci/celestia/celestia-1.3.1.ebuild,v 1.5 2004/11/16 08:40:52 phosphan Exp $ - -inherit eutils flag-o-matic kde-functions - -IUSE="kde gnome" - -DESCRIPTION="Celestia is a free real-time space simulation that lets you experience our universe in three dimensions" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -HOMEPAGE="http://www.shatters.net/celestia" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~x86 amd64" - -# gnome and kde interfaces are exlcusive -DEPEND=">=media-libs/glut-3.7-r2 - virtual/glu - media-libs/jpeg - media-libs/libpng - !kde? ( gnome? ( =x11-libs/gtk+-1.2* - =gnome-base/gnome-libs-1.4* - =kde-base/kdelibs-3.0.5 )" - -pkg_setup() { - # Set up X11 implementation - X11_IMPLEM_P="$(portageq best_version "${ROOT}" virtual/x11)" - X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}" - X11_IMPLEM="${X11_IMPLEM##*\/}" - - einfo "Please note:" - einfo "if you experience problems building celestia with nvidia drivers," - einfo "you can try:" - einfo "opengl-update ${X11_IMPLEM}" - einfo "emerge celestia" - einfo "opengl-update nvidia" - einfo "" - einfo "NOTE: the gnome and kde GUIs are mutually exclusive, kde is" - einfo "recommended. If you're getting the wrong one, run either:" - einfo "'USE=\"gnome -kde\" emerge celestia' (for the gnome interface)" - einfo "or:" - einfo "'USE=\"kde\" emerge celestia' (for the kde interface)" - einfo "as appropriate." -} - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${PN}-${PV}-gtkmain.patch -} - -src_compile() { - local myconf - - filter-flags "-funroll-loops -frerun-loop-opt" - addwrite ${QTDIR}/etc/settings - # currently celestia's "gtk support" requires gnome - if use kde ; then - myconf="$myconf --with-kde --without-gtk" - elif use gnome ; then - myconf="--without-kde --with-gtk" - else - myconf="--without-kde --without-gtk" - # fix for badly written configure script - set-kdedir 3 - set-qtdir 3 - export kde_widgetdir="$KDEDIR/lib/kde3/plugins/designer" - fi - - ./configure --prefix=/usr ${myconf} || die - - emake all || die -} - -src_install() { - make install prefix=${D}/usr - - dodoc AUTHORS COPYING NEWS README TODO controls.txt - dohtml manual/*.html manual/*.css -} diff --git a/app-sci/celestia/files/celestia-1.3.1-gtkmain.patch b/app-sci/celestia/files/celestia-1.3.1-gtkmain.patch deleted file mode 100644 index f6ab65f86abb..000000000000 --- a/app-sci/celestia/files/celestia-1.3.1-gtkmain.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- celestia-1.3.1/src/celestia/gtkmain.cpp.old 2004-01-21 14:29:11.784232453 -0800 -+++ celestia-1.3.1/src/celestia/gtkmain.cpp 2004-01-21 14:34:17.331930870 -0800 -@@ -1330,7 +1330,7 @@ - Star *selStar =(Star *)gtk_clist_get_row_data(list,row); - if (selStar) - { -- browserSel.select(selStar); -+ browserSel = Selection(selStar); - return TRUE; - } - return FALSE; -@@ -1349,9 +1349,9 @@ - if ((body=(Body *)gtk_ctree_node_get_row_data(tree,node))) - { - if (body == (Body *) nearestStar) -- browserSel.select((Star *) nearestStar); -+ browserSel = Selection((Star *) nearestStar); - else -- browserSel.select(body); -+ browserSel = Selection(body); - return TRUE; - } - DPRINTF(0, "Unable to find body for this node.\n"); -@@ -1420,7 +1420,7 @@ - for (unsigned int i = 0; i < currentLength; i++) - gtk_clist_remove(GTK_CLIST(clist), 0); - currentLength=(*stars).size(); -- browserSel.select((Star *)(*stars)[0]); -+ browserSel = Selection((Star *)(*stars)[0]); - UniversalCoord ucPos = appSim->getObserver().getPosition(); - - for (unsigned int i = 0; i < currentLength; i++) -@@ -1514,12 +1514,11 @@ - { - sbrowser.refresh(); - loadNearestStarSystem(); -- tmpSel=browserSel.star; -- browserSel.star=(Star *)nearestStar; -- browserSel.body=NULL; -+ tmpSel=(Star*)browserSel.obj; -+ browserSel = Selection((Star *)nearestStar); - } - else -- browserSel.select((Star *)tmpSel); -+ browserSel = Selection((Star *)tmpSel); - return(TRUE); - } - -@@ -1529,7 +1528,7 @@ - GtkWidget *browser= gnome_dialog_new("Celestial Browser", - GNOME_STOCK_BUTTON_OK, - NULL); -- browserSel.select((Star *)NULL); -+ browserSel = Selection((Star *)NULL); - if (browser == NULL) - { - DPRINTF(0, "Unable to open celestial browser dialog!\n"); -@@ -1584,7 +1583,7 @@ - gtk_container_add(GTK_CONTAINER(align),GTK_WIDGET(hbox)); - sbrowser.setSimulation(appSim); - addStars(); -- tmpSel=browserSel.star; -+ tmpSel=(Star*)browserSel.obj; - gtk_signal_connect(GTK_OBJECT(clist), "select-row", - GTK_SIGNAL_FUNC(listSelect), NULL); - gtk_clist_select_row(GTK_CLIST(clist), 0, 0); -@@ -1667,7 +1666,7 @@ - gnome_dialog_run_and_close(GNOME_DIALOG(browser)); - clist=NULL; - ctree=NULL; -- browserSel.select((Star *)NULL); -+ browserSel = Selection((Star *)NULL); - } - - diff --git a/app-sci/celestia/files/celestia-gcc3.patch b/app-sci/celestia/files/celestia-gcc3.patch deleted file mode 100644 index c62ac6e951fa..000000000000 --- a/app-sci/celestia/files/celestia-gcc3.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff -ur celestia-1.2.4/src/buildstardb.cpp celestia-1.2.4.fixed/src/buildstardb.cpp ---- celestia-1.2.4/src/buildstardb.cpp 2002-01-14 10:48:37.000000000 -0800 -+++ celestia-1.2.4.fixed/src/buildstardb.cpp 2002-10-13 22:31:41.000000000 -0700 -@@ -921,7 +921,7 @@ - { - MultistarSystem* multiSystem = new MultistarSystem(); - multiSystem->nStars = 1; -- multiSystem->stars[0] = iter; -+ multiSystem->stars[0] = &(*iter); - starSystems.insert(MultistarSystemCatalog::value_type(iter->CCDMIdentifier, multiSystem)); - } - else -@@ -933,7 +933,7 @@ - } - else - { -- multiSystem->stars[multiSystem->nStars] = iter; -+ multiSystem->stars[multiSystem->nStars] = &(*iter); - multiSystem->nStars++; - } - } -@@ -1162,7 +1162,7 @@ - for (vector::iterator iter = stars.begin(); - iter != stars.end(); iter++) - { -- starIndex.insert(starIndex.end(), iter); -+ starIndex.insert(starIndex.end(), &(*iter)); - } - - HIPCatalogComparePredicate pred; -diff -ur celestia-1.2.4/src/celengine/starbrowser.h celestia-1.2.4.fixed/src/celengine/starbrowser.h ---- celestia-1.2.4/src/celengine/starbrowser.h 2002-01-15 17:55:49.000000000 -0800 -+++ celestia-1.2.4.fixed/src/celengine/starbrowser.h 2002-10-13 22:11:30.000000000 -0700 -@@ -15,6 +15,8 @@ - #include "star.h" - #include "stardb.h" - #include "simulation.h" -+#include -+using namespace std; - - class StarBrowser - { -diff -ur celestia-1.2.4/src/celestia/celestiacore.cpp celestia-1.2.4.fixed/src/celestia/celestiacore.cpp ---- celestia-1.2.4/src/celestia/celestiacore.cpp 2002-05-02 10:53:49.000000000 -0700 -+++ celestia-1.2.4.fixed/src/celestia/celestiacore.cpp 2002-10-13 22:28:14.000000000 -0700 -@@ -194,7 +194,7 @@ - sim->setFrame(fav.coordSys, sim->getSelection()); - } - --void CelestiaCore::addFavorite(string name, string parentFolder, FavoritesList::const_iterator* iter) -+void CelestiaCore::addFavorite(std::string name, std::string parentFolder, FavoritesList::iterator* iter) - { - FavoritesList::iterator pos; - if(!iter) -@@ -214,7 +214,7 @@ - favorites->insert(pos, fav); - } - --void CelestiaCore::addFavoriteFolder(string name, FavoritesList::const_iterator* iter) -+void CelestiaCore::addFavoriteFolder(std::string name, FavoritesList::iterator* iter) - { - FavoritesList::iterator pos; - if(!iter) -@@ -1137,9 +1137,8 @@ - if (sun != NULL) - { - double distFromSun = body.getHeliocentricPosition(t).distanceFromOrigin(); -- float planetTemp = sun->getTemperature() * -- (float) (pow(1 - body.getAlbedo(), 0.25) * -- sqrt(sun->getRadius() / (2 * distFromSun))); -+ float planetTemp = sun->getTemperature() * -+ (float) (pow((float)(1 - body.getAlbedo()), (float) 0.25) *+ sqrt((float)(sun->getRadius() / (2 * distFromSun)))); - overlay << setprecision(0); - overlay << "Temperature: " << planetTemp << " K\n"; - overlay << setprecision(3); -diff -ur celestia-1.2.4/src/celestia/celestiacore.h celestia-1.2.4.fixed/src/celestia/celestiacore.h ---- celestia-1.2.4/src/celestia/celestiacore.h 2002-04-02 07:24:09.000000000 -0800 -+++ celestia-1.2.4.fixed/src/celestia/celestiacore.h 2002-10-13 22:22:20.000000000 -0700 -@@ -126,8 +126,8 @@ - void readFavoritesFile(); - void writeFavoritesFile(); - void activateFavorite(FavoritesEntry&); -- void addFavorite(std::string, std::string, FavoritesList::const_iterator* iter=NULL); -- void addFavoriteFolder(std::string, FavoritesList::const_iterator* iter=NULL); -+ void addFavorite(std::string, std::string, FavoritesList::iterator* iter=NULL); -+ void addFavoriteFolder(std::string, FavoritesList::iterator* iter=NULL); - const FavoritesList* getFavorites(); - - const DestinationList* getDestinations(); -diff -ur celestia-1.2.4/src/celestia/glutmain.cpp celestia-1.2.4.fixed/src/celestia/glutmain.cpp ---- celestia-1.2.4/src/celestia/glutmain.cpp 2002-04-30 10:36:11.000000000 -0700 -+++ celestia-1.2.4.fixed/src/celestia/glutmain.cpp 2002-10-13 22:12:53.000000000 -0700 -@@ -32,6 +32,8 @@ - #include - #include - #include "celestiacore.h" -+#include -+using namespace std; - /* what are you supposed to be? - #include "popt.h" - */ diff --git a/app-sci/celestia/files/digest-celestia-1.3.0 b/app-sci/celestia/files/digest-celestia-1.3.0 deleted file mode 100644 index 1ba397b6e2c2..000000000000 --- a/app-sci/celestia/files/digest-celestia-1.3.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 cf11c9d1b1de5752c9b4681c15b823b4 celestia-1.3.0.tar.gz 15935711 diff --git a/app-sci/celestia/files/digest-celestia-1.3.0-r1 b/app-sci/celestia/files/digest-celestia-1.3.0-r1 deleted file mode 100644 index 1ba397b6e2c2..000000000000 --- a/app-sci/celestia/files/digest-celestia-1.3.0-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 cf11c9d1b1de5752c9b4681c15b823b4 celestia-1.3.0.tar.gz 15935711 diff --git a/app-sci/celestia/files/digest-celestia-1.3.1 b/app-sci/celestia/files/digest-celestia-1.3.1 deleted file mode 100644 index 4f4592b32402..000000000000 --- a/app-sci/celestia/files/digest-celestia-1.3.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 fcb73c43f5899f8f7e6d0c619a818a8b celestia-1.3.1.tar.gz 13291363