Fix dosyms, drop old, version bump: move to EAPI4, remove obsolete dependencies, use PN whenever possible

Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64

4 files changed, 49 insertions, 34 deletions

diff --git a/sci-astronomy/stellarium/ChangeLog b/sci-astronomy/stellarium/ChangeLog
index f5fe88614944..470c928f2db0 100644
--- a/sci-astronomy/stellarium/ChangeLog
+++ b/sci-astronomy/stellarium/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-astronomy/stellarium
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/ChangeLog,v 1.76 2011/08/21 03:29:00 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/ChangeLog,v 1.77 2011/11/20 10:49:03 xarthisius Exp $
+
+*stellarium-0.11.1 (20 Nov 2011)
+
+  20 Nov 2011; Kacper Kowalik <xarthisius@gentoo.org> +stellarium-0.11.1.ebuild,
+  -stellarium-0.10.6.ebuild, stellarium-0.11.0.ebuild:
+  Fix dosyms, drop old, version bump: move to EAPI4, remove obsolete
+  dependencies, use PN whenever possible
 
   21 Aug 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   stellarium-0.11.0.ebuild:
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 8dbfc148d0cf..bab384728f2a 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -1,21 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST stars_4_1v0_0.cat 17275482 RMD160 27287e8970c99ee51baeb81de30574a96a1ff21d SHA1 3098174bec4797af54d98d48f60d6bc2ecabaf49 SHA256 e0373d869d08ffac2ba78e7fbe29add6511073cd74a52b9918d8b77fb05827e7
 DIST stars_5_2v0_0.cat 46096018 RMD160 b6a74ea80946ac40521dbf0752c018cd1cc3397f SHA1 358e2f62539d21d775a07ded0dcb70bdc8368265 SHA256 d093e25e8cb8350ef74706d7bf05455d224acb076da87bf1b784b5cf0e0d9931
 DIST stars_6_2v0_0.cat 160019110 RMD160 adef51e800a9c95fc991b7cbc321d324e38597dc SHA1 babcc1d3d12a334e4b3e5d38270460a3e3645d2b SHA256 40a8674dead3178d9f36178f62e128047bb53784fa3ff408e473a5969a4ee379
 DIST stars_7_2v0_0.cat 348268348 RMD160 f317f064d3e334e045f59e18d5239c51a8dfee87 SHA1 c66174cc5963a865a85423ebc637c750c8715730 SHA256 730ca2d9182af5ebd4efcc5f87461ad9156caf79cadf1a79708fa970acb809fe
 DIST stars_8_2v0_0.cat 706781416 RMD160 46d34c9296e43502557ce86a4ae143d5375dad29 SHA1 11d84210340a3c631711c350ab1b6df132c6e4b9 SHA256 91b79dcf97464b4ca0f6c604e745dac2c6ca02e25ed986dbec2de5f6d6e8a1f9
-DIST stellarium-0.10.6.tar.gz 37523469 RMD160 31ba1a9042984939f135195c31f15f0a20021085 SHA1 b28f74d145c89656d9f79b86abe00297a3559cef SHA256 4654316b488f56a9af8cdc2d0f57596fec2d9e450f020db22b5175030848171d
 DIST stellarium-0.11.0.tar.gz 38161018 RMD160 5684e9ffbb9e4ac114e1d8b5f7024781a2e8d8b3 SHA1 e0d7293e175ac302b45d2849a82a8c0fa7e3ca3e SHA256 dbedf47dd0744fb325d67d63d1279101be7f4259af2a5e8027f1072012dd2587
-EBUILD stellarium-0.10.6.ebuild 1923 RMD160 ded50bb0f1dd3432f9a298cb320faf3de50c7f96 SHA1 8a9ffb22fa35bc72c68eaef15ea9a66f7722c4e8 SHA256 51bee9346e923c06f7cdb98e66dc7c118322dd41cb3b71135f1e30c15bfca1f1
-EBUILD stellarium-0.11.0.ebuild 1923 RMD160 284daa6b9ae83efeefad1df4364bf983eaef2ad6 SHA1 8572fe53ce4c78179dfd61a8006c88f32ecd118a SHA256 0fb32ade4d58835fd427876f0f641bf2af8c80f349ae4dbe389312f08f076966
-MISC ChangeLog 11830 RMD160 13d9d67f8f280e2ab607340fdae9a99c52b9098b SHA1 ab6b4086b8038b022f15793f4f400d066199edb5 SHA256 889b6e01bac2d70aee2954008f5ac2e5a11c965c86c1a0efc0479a7307ac1cbc
+DIST stellarium-0.11.1.tar.gz 45681904 RMD160 5e6a1c6fd2822cfa5391aff67f17610723d834f7 SHA1 e721a9cef0c736354c477fdb25cce607a9a3b52e SHA256 f47ee142b3298cf473c2ea62fe3566550a2f5f7518779bb5f422452a9e283fd3
+EBUILD stellarium-0.11.0.ebuild 1955 RMD160 ac1aa1a9960203fd22500a1bf16c711f9e4f3443 SHA1 ed6aa1c5770419fa995f89d5824098029325ac1b SHA256 5043febd16ce1d13c5aa40e5cead7d9977b88223056731dec1e4a8b150570203
+EBUILD stellarium-0.11.1.ebuild 1784 RMD160 3db4c08e5913bf34dda59e83f6e603b6916f2c3c SHA1 776ddd3905505c618737e53021b39954b3b8d364 SHA256 2d77f540871340767e43f5f92d24572419274997284a4c4bb9d983e4b1cf18db
+MISC ChangeLog 12111 RMD160 9c724b723570be75ccd5270c668d56cbbfe3ba8c SHA1 0a445bb01b33f66aef09be7313b15c32215fa644 SHA256 51814151660aa7d68abfceed649bd1af498c666d0b4ca49d52a4253049a42316
 MISC metadata.xml 314 RMD160 5687bb5c6e518481c34cea7f6f047be9bad769a3 SHA1 68c5147773bd730774134394a97a715226b1de34 SHA256 592e6191e31b47b24808994916299bf5589feb10432e7679cbd0f35504815a36
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk5Qe4MACgkQuUQtlDBCeQIfHwCeJ/JDs8Cy4acJTNmuE2Pp4KQh
-wpUAn0kQncq1ivRB5em5cPmVdm3AEQlB
-=S1/N
+iQIcBAEBCAAGBQJOyNsqAAoJEF0huFKJUZL58rMP/0DuPuBHCV3Xddh2UobbdzLC
+Gvs8z1gDB+uCWLSUJghuHwHp+pWyy0nGIp7crzC5rbP/nq3awR/ukmyKzcjQXJsc
+e72e2jJTA18R7kkAwETlBUNnLH49IWNkwvhDO2KhIiHk3HoPSX0oEIrO3vxaQHEo
+AUwS+68CdWIz7CaTulbJpIk7JvINx7c0GXWfRXYDIBDaBVOhWxxyfAAiRZM+wMWi
+VDiWo2NwBqsUWSppoyWen8NOvFCSmyfD2seyiHApD7tUCDQSlYhJF4HEIbMgX4DE
+IzvkXygtPv+XBwdMLKZMks6DnEwWXGsjYU0UIVnbfPL2UjytTBVfBikbr4sqwPb3
+ri9AKJs2gbysDTRZnP7Zngbk8MN+OXenvrC1kN8oKIHUXEAo9UF2+/MvAgh1fFH2
+B4PLiZSbBmSs9F0OcIBfsTzbC9dVSbtsLUHVs4IIspxBLubC6MvDHdOUGLOulbqC
+F24uX8xStRmRKWRb5jhmKV6ziLkAmv59rEPE0Zdaf5IktaRngH3qume+r6MdPJGM
+uCICVw8bhCvK2LN3CH+Q+tie3oVWB+NhjdhSlVHuyHMcOfkuEgRrk21ZQvNkkAAG
+InIrgPOZGu8iDz7S3Ytp6Iaqybns89ftefW3HV6MJDRPR2DDJ+lL5qsBpauwQua5
+SYMgQDrJsrS5OVrWqeF9
+=7T/2
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/stellarium/stellarium-0.11.0.ebuild b/sci-astronomy/stellarium/stellarium-0.11.0.ebuild
index 59013a333af6..5255ffd735d8 100644
--- a/sci-astronomy/stellarium/stellarium-0.11.0.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.11.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/stellarium-0.11.0.ebuild,v 1.4 2011/08/21 03:29:00 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/stellarium-0.11.0.ebuild,v 1.5 2011/11/20 10:49:03 xarthisius Exp $
 
 EAPI=2
 inherit cmake-utils eutils
@@ -51,8 +51,8 @@ src_install() {
 
 	# use the more up-to-date system fonts
 	rm -f "${D}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/
+	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
 
 	if use stars ; then
 		insinto /usr/share/${PN}/stars/default
diff --git a/sci-astronomy/stellarium/stellarium-0.10.6.ebuild b/sci-astronomy/stellarium/stellarium-0.11.1.ebuild
index 4f3f3da76b76..b7be1ff984f3 100644
--- a/sci-astronomy/stellarium/stellarium-0.10.6.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.11.1.ebuild
@@ -1,33 +1,33 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/stellarium-0.10.6.ebuild,v 1.5 2011/03/25 12:40:47 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/stellarium-0.11.1.ebuild,v 1.1 2011/11/20 10:49:03 xarthisius Exp $
+
+EAPI=4
+CMAKE_MIN_VERSION="2.4.7"
 
-EAPI=2
 inherit cmake-utils eutils
 
 DESCRIPTION="Stellarium renders 3D photo-realistic skies in real time."
 HOMEPAGE="http://www.stellarium.org/"
-SRC_URI="mirror://sourceforge/stellarium/${P}.tar.gz
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 	stars? (
-		mirror://sourceforge/stellarium/stars_4_1v0_0.cat
-		mirror://sourceforge/stellarium/stars_5_2v0_0.cat
-		mirror://sourceforge/stellarium/stars_6_2v0_0.cat
-		mirror://sourceforge/stellarium/stars_7_2v0_0.cat
-		mirror://sourceforge/stellarium/stars_8_2v0_0.cat
+		mirror://sourceforge/${PN}/stars_4_1v0_0.cat
+		mirror://sourceforge/${PN}/stars_5_2v0_0.cat
+		mirror://sourceforge/${PN}/stars_6_2v0_0.cat
+		mirror://sourceforge/${PN}/stars_7_2v0_0.cat
+		mirror://sourceforge/${PN}/stars_8_2v0_0.cat
 	)"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="nls stars"
 RESTRICT="test"
 
 RDEPEND="virtual/opengl
 	virtual/glu
-	media-libs/libpng
 	media-libs/freetype:2
-	virtual/jpeg
-	>=x11-libs/qt-core-4.6.0:4
+	x11-libs/qt-core:4
 	x11-libs/qt-gui:4
 	x11-libs/qt-opengl:4
 	x11-libs/qt-script:4
@@ -36,10 +36,9 @@ RDEPEND="virtual/opengl
 	media-fonts/dejavu
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
-	dev-libs/boost
-	>=dev-util/cmake-2.4.7
 	nls? ( sys-devel/gettext )
 	x11-libs/libXt"
+DOCS=( AUTHORS ChangeLog README )
 
 src_configure() {
 	mycmakeargs=( $(cmake-utils_use_enable nls NLS) )
@@ -47,18 +46,17 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 
 	# use the more up-to-date system fonts
-	rm -f "${D}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/
+	rm -f "${D}"/usr/share/${PN}/data/DejaVuSans{Mono,}.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/data/DejaVuSans.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf /usr/share/${PN}/data/DejaVuSansMono.ttf
 
 	if use stars ; then
 		insinto /usr/share/${PN}/stars/default
-		doins "${DISTDIR}"/stars_[45678]_[12]v0_0*.cat || die "doins failed"
+		doins "${DISTDIR}"/stars_[45678]_[12]v0_0*.cat
 	fi
-	newicon doc/images/stellarium-logo.png ${PN}.png
+	newicon doc/images/${PN}-logo.png ${PN}.png
 	make_desktop_entry ${PN} Stellarium ${PN} "Education;Science;Astronomy"
-	dodoc AUTHORS ChangeLog README
 }