Links with posix threads, fixed for prefix, keyword amd64-linux, x86-linux, removed old

(Portage version: 2.2.01.20796-prefix/cvs/Linux x86_64)

4 files changed, 27 insertions, 56 deletions

diff --git a/sci-astronomy/galaxy/ChangeLog b/sci-astronomy/galaxy/ChangeLog
index 6b064dcc6a4a..15fb34758aa3 100644
--- a/sci-astronomy/galaxy/ChangeLog
+++ b/sci-astronomy/galaxy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-astronomy/galaxy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/galaxy/ChangeLog,v 1.6 2012/02/02 11:22:26 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/galaxy/ChangeLog,v 1.7 2012/08/05 17:53:57 bicatali Exp $
+
+  05 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> -galaxy-2.0.ebuild,
+  galaxy-2.1.ebuild, metadata.xml:
+  Links with posix threads, fixed for prefix, keyword amd64-linux, x86-linux,
+  removed old
 
 *galaxy-2.1 (02 Feb 2012)
 
@@ -28,4 +33,3 @@
   +files/galaxy-1.8-gentoo.patch, +metadata.xml:
   New ebuild for galaxy. Ebuild written by Juan Pablo Lassala. Fixes bug
   321719
-
diff --git a/sci-astronomy/galaxy/galaxy-2.0.ebuild b/sci-astronomy/galaxy/galaxy-2.0.ebuild
deleted file mode 100644
index 3ded5d608e74..000000000000
--- a/sci-astronomy/galaxy/galaxy-2.0.ebuild
+++ /dev/null
@@ -1,38 +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-2.0.ebuild,v 1.2 2011/12/28 12:21:18 xarthisius Exp $
-
-EAPI=4
-
-inherit fdo-mime 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"
-
-pkg_setup() {
-	tc-export CXX
-}
-
-src_prepare() {
-	sed -e '/DOCDIR/ s/PROGRAM)/&-\$(VERSION)/g' \
-		-e '/xdg-desktop-menu/d' \
-		-i Makefile || die
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-astronomy/galaxy/galaxy-2.1.ebuild b/sci-astronomy/galaxy/galaxy-2.1.ebuild
index 1a5c1c658422..90caaa3077f4 100644
--- a/sci-astronomy/galaxy/galaxy-2.1.ebuild
+++ b/sci-astronomy/galaxy/galaxy-2.1.ebuild
@@ -1,18 +1,21 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/galaxy/galaxy-2.1.ebuild,v 1.1 2012/02/02 11:22:26 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/galaxy/galaxy-2.1.ebuild,v 1.2 2012/08/05 17:53:57 bicatali Exp $
 
 EAPI=4
 
-inherit fdo-mime toolchain-funcs
+inherit fdo-mime toolchain-funcs flag-o-matic
 
-DESCRIPTION="stellar simulation program"
-HOMEPAGE="http://kornelix.squarespace.com/galaxy/"
-SRC_URI="http://kornelix.squarespace.com/storage/downloads/${P}.tar.gz"
+# probably change every release
+PID="1/3/0/3/13035936"
+
+DESCRIPTION="Stellar simulation program"
+HOMEPAGE="http://www.kornelix.com/galaxy.html"
+SRC_URI="http://www.kornelix.com/uploads/${PID}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="x11-libs/gtk+:3"
@@ -21,6 +24,8 @@ RDEPEND="${DEPEND}
 
 pkg_setup() {
 	tc-export CXX
+	append-ldflags -pthread
+	export PREFIX="${EPREFIX}/usr"
 }
 
 src_prepare() {
diff --git a/sci-astronomy/galaxy/metadata.xml b/sci-astronomy/galaxy/metadata.xml
index 9c9a659cfdef..aec35d88fb2f 100644
--- a/sci-astronomy/galaxy/metadata.xml
+++ b/sci-astronomy/galaxy/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-astronomy</herd>
-	<maintainer>
-		<email>xarthisius@gentoo.org</email>
-		<name>Kacper Kowalik</name>
-	</maintainer>
-	<longdescription lang="en">
-		Stellar simulation program. Watch a few stars move around each-other, 
-		accelerated by their mutual attractions, or watch thousands of random 
-		stars evolve into a spiral galaxy.
-	</longdescription>
+<herd>sci-astronomy</herd>
+<maintainer>
+  <email>xarthisius@gentoo.org</email>
+  <name>Kacper Kowalik</name>
+</maintainer>
+<longdescription lang="en">
+  Stellar simulation program. Watch a few stars move around each-other, 
+  accelerated by their mutual attractions, or watch thousands of random 
+  stars evolve into a spiral galaxy.
+</longdescription>
 </pkgmetadata>