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

Package-Manager: portage-2.2.01.20796-prefix/cvs/Linux x86_64

5 files changed, 35 insertions, 76 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/Manifest b/sci-astronomy/galaxy/Manifest
index c00c0135d5c0..38b8159f0f25 100644
--- a/sci-astronomy/galaxy/Manifest
+++ b/sci-astronomy/galaxy/Manifest
@@ -1,26 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST galaxy-2.0.tar.gz 282568 RMD160 4d057517772aa618824837813ea5aa888a7a6908 SHA1 992baa1db9051fb1a7b746ff35c17176a1997cba SHA256 4542cbb3dad338df31b6af3857f80f03ebb99f261fd82fd5d0d2f6dc82e6c1e9
-DIST galaxy-2.1.tar.gz 268248 RMD160 907b813e315b247421778c374b4c8b5b5b8273f5 SHA1 1a08f6a1049db53896d5ff3100228458bd43e590 SHA256 2772ae8859fd9580cb29162c6e6a0df4f9bce97899e3c5d848a5276e8439df3f
-EBUILD galaxy-2.0.ebuild 809 RMD160 2c28de1942278c2c344f204e45d43abedbe78689 SHA1 e25ec21f739136b0a5dbe199ae14e7bd572f312b SHA256 ca4fc77369ce78576bae15a5f831c268eaed3f1b96ff86ac090ad7ab2a5b18bb
-EBUILD galaxy-2.1.ebuild 809 RMD160 74723b8aef5ae8b6d5f62cefa2772402206b4d1f SHA1 61dadb1468a9680799f24dc602cd0d85a7f70876 SHA256 5f8b9404b7e0fe7e53fba1373adb1b1080192078cd57daaa2226a16358b80b02
-MISC ChangeLog 1117 RMD160 a7ab7592604379f23cb06f7f08408a14f62bbeaa SHA1 2f68b4ce526fff81d6a076e6774ad04dce2419c5 SHA256 20a552bd81b876ddde8d1fa24d207b50ead30dfa5ec4bfb30eddba3d5436d141
-MISC metadata.xml 497 RMD160 fcf64f30cabffcb83fb24f4a7d9c857a59f936b3 SHA1 aea3d3736d01ba7a9d6ab3f2096c483076eb9b76 SHA256 adb332823b5415d6a23edabad9cc75bf56214da487955beed9c2d51826cd36f4
+DIST galaxy-2.1.tar.gz 268248 SHA256 2772ae8859fd9580cb29162c6e6a0df4f9bce97899e3c5d848a5276e8439df3f SHA512 841afc5857c186c220937eb4dcc82c0fcb8074a99f293c38cf04c78cdd030fba513e93a76648e265bb3853a993e469dc97eaa2de53edf75dfb87be80617f33d6 WHIRLPOOL 7fb0e2529a894bf45305456dffa8cc80080f53c5f9e08e3d1a593f978afdeaa937083a867aa8270f9b8270fd580bb146cfebce61d1c9668e0df480f1a9236fdd
+EBUILD galaxy-2.1.ebuild 942 SHA256 1c4924e8b1eb54a210e4fb34d21e15cee64df26eb00bc5b367dc99ed121bd05f SHA512 9bd4cf1f2b776839e85c5c07e7fe0c007cfa4db4cae726a9af8ef85b303ced5656eebe2097aac832ea22fd459949d59d6de58b4503cdb9d40ffd1fa3807d36e7 WHIRLPOOL 026cce86b7fb8ee3a20e1a63a28a81eaab912a6810a95b961550c63478a5afbe8dfc8761d5334dbf3e0a975b2e98faf7c6cb58a1997014dee2dc62e825af16fc
+MISC ChangeLog 1317 SHA256 a88b4f0452bc6f748394726aebc35c58c9430a7ddec8538850d9147163d29b9a SHA512 9de2beabb631f3950414e1e9242757157844a0592abbb5d86017b6bb804686c2d432361544deed6da677a9a58bff326dc8897ccb3da8771fddd93f1af80c2b1f WHIRLPOOL 9ac05823b218342099a3c577f0fb8b9622204f53581b689bbb06d7c0a893299a488b64e4381db14fdb9bbbcfcdb3820fc19f891c98fbbaf2819885155054b231
+MISC metadata.xml 492 SHA256 751dbe0ef584b6094cb54384bd541c1150b1b985dbc13d9f65f58afaccd8d4e1 SHA512 856e07e7dd1c64c893867226e88b587ccf5126715e8675c3a33b055ce0f83e2670d35b92281cbe28d85410d07b67c5dfcd78790c4272dcd0f9707a1e498b7166 WHIRLPOOL be9d54dcbb6fa088aa8d60d9362e9091a245b8a4b8a30f9bd0428cccce0615c65ce43ab8644185c33d0960da0ce5889ba7415b74ab09384b019db9807c5b646e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPKnILAAoJEF0huFKJUZL5o+wP/jkaVFWB43ta1xTl3LytnEMu
-Ct+rEdOgw3+rfRiT+M38kTUq4WrOyMCf3KfBvs32/xVqfvrDHmPu8GS2cIDnR2O3
-6OLppLPTd7sl+bi2jk6Sa7KIy76VFxh/tOsTBRYou46nLwrB7MF8hBCFBugb3qNX
-nHU8gMuHTxgpAUfczjoNM9JeypSufCvqU/eZ8BmUPZC6mtmFYLPhpub0QICPalXz
-/5AXBDbWe3BS0mUtuU7JCJxMbGpOBI4b409rUhtwfbyMT4cWP7pSYkfDG9pb84vF
-NzsWfa/EZJVQGwN++mD1fdW0Ed7DNwFYhCwIsm7GizXFD1B0yDTmeQwu4x8xvhHH
-/ph/Al1OyS82cgPY6s8ij6qOyI+EVz2DHDarntunxiHKqy4dpBfRU+o3xgbuc3Dh
-EIINjXSOCo0D2PdZxd/mNCdz2xAcs3pTRcbxb7cGJ3yPil2QqX85MGhsFSDy2VnZ
-z6N37FUu7Ut/qlZ2LkiY3S6FssC2TdnBs0GLT1pOasdOYWY1sVijVFZq0PUEIjR8
-TVjLcg6lOXWOhG8DmXozp3GKU6zr3l5nrIV9JnPLRKDI8jLjpemFF+KkKdG/d6fY
-kCLtxW24mist9De6IXXYqPl2qy/g0ETb4TZKu+E0rEx45zbwHIzdxQw304OoWs9z
-aT0VJX4tL+AmPBjUt740
-=aCoa
+iEYEAREIAAYFAlAeszsACgkQ1ycZbhPLE2DRVgCeLxpn/IrpMwj5xSHVU7uHFjqD
+CXsAoJwlYnpdGrouwpt7WXHe7uaCd168
+=SMzd
 -----END PGP SIGNATURE-----
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>