From 1ebc3d62f19c66a883e24fee0cb7fbef7b9605de Mon Sep 17 00:00:00 2001 From: Kacper Kowalik Date: Wed, 28 Dec 2011 12:14:11 +0000 Subject: Version bump, drop old (Portage version: 2.2.0_alpha83/cvs/Linux x86_64) --- sci-astronomy/galaxy/ChangeLog | 8 ++- sci-astronomy/galaxy/files/galaxy-1.8-gentoo.patch | 65 ---------------------- sci-astronomy/galaxy/galaxy-1.8.ebuild | 27 --------- sci-astronomy/galaxy/galaxy-2.0.ebuild | 29 ++++++++++ 4 files changed, 36 insertions(+), 93 deletions(-) delete mode 100644 sci-astronomy/galaxy/files/galaxy-1.8-gentoo.patch delete mode 100644 sci-astronomy/galaxy/galaxy-1.8.ebuild create mode 100644 sci-astronomy/galaxy/galaxy-2.0.ebuild (limited to 'sci-astronomy') diff --git a/sci-astronomy/galaxy/ChangeLog b/sci-astronomy/galaxy/ChangeLog index 28b5769c3a55..b4b81cbaa733 100644 --- a/sci-astronomy/galaxy/ChangeLog +++ b/sci-astronomy/galaxy/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-astronomy/galaxy # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/galaxy/ChangeLog,v 1.3 2011/08/04 18:30:46 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/galaxy/ChangeLog,v 1.4 2011/12/28 12:14:11 xarthisius Exp $ + +*galaxy-2.0 (28 Dec 2011) + + 28 Dec 2011; Kacper Kowalik -galaxy-1.8.ebuild, + -files/galaxy-1.8-gentoo.patch, +galaxy-2.0.ebuild: + Version bump, drop old 04 Aug 2011; Sébastien Fabbro metadata.xml: Switched herd to sci-astronomy diff --git a/sci-astronomy/galaxy/files/galaxy-1.8-gentoo.patch b/sci-astronomy/galaxy/files/galaxy-1.8-gentoo.patch deleted file mode 100644 index fae98f14669d..000000000000 --- a/sci-astronomy/galaxy/files/galaxy-1.8-gentoo.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- desktop -+++ desktop -@@ -3,7 +3,7 @@ - Categories=Game - Type=Application - Terminal=false --Exec=/usr/local/bin/galaxy --Icon=/usr/local/share/galaxy/icons/galaxy.png -+Exec=/usr/bin/galaxy -+Icon=/usr/share/galaxy/icons/galaxy.png - GenericName=Stellar Simulation - Comment=Stars steered by gravity, galaxy evolution ---- Makefile -+++ Makefile -@@ -8,38 +8,39 @@ - # replace -O3 with -g for GDB debugging - CXXFLAGS ?= -O3 -Wall - LDFLAGS ?= -O3 -Wall -rdynamic --PREFIX ?= /usr/local -+PREFIX = /usr - --CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-2.0` --LFLAGS = $(LDFLAGS) `pkg-config --libs gtk+-2.0 gthread-2.0` -+GTK_CFLAGS = `pkg-config --cflags gtk+-2.0` -+GTK_LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0` - - BINDIR = $(PREFIX)/bin - DATADIR = $(PREFIX)/share/$(PROGRAM) - ICONDIR = $(DATADIR)/icons --DESKTOP = $(DATADIR)/kornelix-$(PROGRAM).desktop --DOCDIR = $(PREFIX)/share/doc/$(PROGRAM) -+DESKDIR = $(PREFIX)/share/applications -+DESKTOP = $(DESKDIR)/$(PROGRAM).desktop -+DOCDIR = $(PREFIX)/share/doc/$(PROGRAM)-$(VERSION) - - $(PROGRAM): $(PROGRAM).o zfuncs.o -- $(CXX) $(LFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o $(GTK_LIBS) - - $(PROGRAM).o: $(SOURCE) -- $(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE) \ -+ $(CXX) $(CXXFLAGS) $(GTK_CFLAGS) -o $(PROGRAM).o -c $(SOURCE) \ - -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" - - zfuncs.o: zfuncs.cc -- $(CXX) $(CFLAGS) zfuncs.cc \ -+ $(CXX) $(CXXFLAGS) $(GTK_CFLAGS) -c zfuncs.cc \ - -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\"" - - install: $(PROGRAM) - mkdir -p $(DESTDIR)$(DOCDIR) - mkdir -p $(DESTDIR)$(BINDIR) -- mkdir -p $(DESTDIR)$(DATADIR) - mkdir -p $(DESTDIR)$(ICONDIR) -- cp -R doc/* $(DESTDIR)$(DOCDIR) -+ mkdir -p $(DESTDIR)$(DESKDIR) -+ cp -R doc/{images,userguide-en.html} $(DESTDIR)$(DOCDIR) - cp -R data/* $(DESTDIR)$(DATADIR) - cp icons/* $(DESTDIR)$(ICONDIR) -+ cp -f desktop $(DESTDIR)$(DESKTOP) - cp $(PROGRAM) $(DESTDIR)$(BINDIR) -- @ echo use make menu to install desktop menu - - menu: - cp -f desktop $(DESKTOP) diff --git a/sci-astronomy/galaxy/galaxy-1.8.ebuild b/sci-astronomy/galaxy/galaxy-1.8.ebuild deleted file mode 100644 index 5760ea23b62b..000000000000 --- a/sci-astronomy/galaxy/galaxy-1.8.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/galaxy/galaxy-1.8.ebuild,v 1.2 2011/03/02 21:35:23 jlec Exp $ - -EAPI="1" - -inherit base toolchain-funcs - -DESCRIPTION="stellar simulation program" -HOMEPAGE="http://kornelix.squarespace.com/galaxy/" -SRC_URI="http://kornelix.squarespace.com/storage/downloads/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="x11-libs/gtk+:2" -RDEPEND="${DEPEND} - x11-misc/xdg-utils" - -PATCHES=( "${FILESDIR}/${P}-gentoo.patch" ) -DOCS=( "doc/CHANGES" "doc/README" ) - -pkg_setup() { - tc-export CXX -} diff --git a/sci-astronomy/galaxy/galaxy-2.0.ebuild b/sci-astronomy/galaxy/galaxy-2.0.ebuild new file mode 100644 index 000000000000..4f5057028064 --- /dev/null +++ b/sci-astronomy/galaxy/galaxy-2.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/galaxy/galaxy-2.0.ebuild,v 1.1 2011/12/28 12:14:11 xarthisius Exp $ + +EAPI=4 + +inherit toolchain-funcs + +DESCRIPTION="stellar simulation program" +HOMEPAGE="http://kornelix.squarespace.com/galaxy/" +SRC_URI="http://kornelix.squarespace.com/storage/downloads/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="x11-libs/gtk+:2 + x11-misc/xdg-utils" +RDEPEND="${DEPEND}" + +pkg_setup() { + tc-export CXX +} + +src_prepare() { + sed -e '/DOCDIR/ s/PROGRAM)/&-\$(VERSION)/g' \ + -i Makefile || die +} -- cgit v1.2.3-65-gdbad