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

(Portage version: 2.2.0_alpha75/cvs/Linux x86_64)

3 files changed, 30 insertions, 25 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/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
 }