sci-chemistry/gperiodic: Bump EAPI to 4; fix desktop file

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

3 files changed, 38 insertions, 39 deletions

diff --git a/sci-chemistry/gperiodic/ChangeLog b/sci-chemistry/gperiodic/ChangeLog
index a1d9b12ddc3d..432cf65a16ec 100644
--- a/sci-chemistry/gperiodic/ChangeLog
+++ b/sci-chemistry/gperiodic/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/gperiodic
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gperiodic/ChangeLog,v 1.20 2012/05/04 07:02:33 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gperiodic/ChangeLog,v 1.21 2012/09/05 07:03:30 jlec Exp $
+
+  05 Sep 2012; Justin Lecher <jlec@gentoo.org> gperiodic-2.0.10.ebuild,
+  gperiodic-2.0.10-r2.ebuild:
+  Bump EAPI to 4; fix desktop file
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> gperiodic-2.0.10.ebuild,
   gperiodic-2.0.10-r2.ebuild:
diff --git a/sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild b/sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild
index 8b25609aaaa8..53b6f69fee91 100644
--- a/sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild
+++ b/sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild,v 1.5 2012/05/04 07:02:32 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild,v 1.6 2012/09/05 07:03:30 jlec Exp $
 
-EAPI="2"
+EAPI=4
 
-inherit toolchain-funcs eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Periodic table application for Linux"
-SRC_URI="http://www.frantz.fi/software/${P}.tar.gz"
 HOMEPAGE="http://www.frantz.fi/software/gperiodic.php"
+SRC_URI="http://www.frantz.fi/software/${P}.tar.gz"
 
 KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="nls"
 
-RDEPEND=">=sys-libs/ncurses-5.2
+RDEPEND="
+	sys-libs/ncurses:5
 	x11-libs/gtk+:2
 	x11-libs/cairo[X]
 	nls? ( sys-devel/gettext )"
@@ -27,18 +28,21 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-makefile.patch \
 		"${FILESDIR}"/${P}-nls.patch
+	sed \
+		-e '/Encoding/d' \
+		-i ${PN}.desktop || die
 }
 
 src_compile() {
 	local myopts
 	use nls && myopts="enable_nls=1" || myopts="enable_nls=0"
-	emake CC=$(tc-getCC) ${myopts} || die
+	emake CC=$(tc-getCC) ${myopts}
 }
 
 src_install() {
 	local myopts
 	use nls && myopts="enable_nls=1" || myopts="enable_nls=0"
-	emake DESTDIR="${D}" ${myopts} install || die
-	dodoc AUTHORS ChangeLog README NEWS || die
-	newdoc po/README README.translation || die
+	emake DESTDIR="${D}" ${myopts} install
+	dodoc AUTHORS ChangeLog README NEWS
+	newdoc po/README README.translation
 }
diff --git a/sci-chemistry/gperiodic/gperiodic-2.0.10.ebuild b/sci-chemistry/gperiodic/gperiodic-2.0.10.ebuild
index 24f2c87a8498..1438f72ffd59 100644
--- a/sci-chemistry/gperiodic/gperiodic-2.0.10.ebuild
+++ b/sci-chemistry/gperiodic/gperiodic-2.0.10.ebuild
@@ -1,61 +1,52 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gperiodic/gperiodic-2.0.10.ebuild,v 1.7 2012/05/04 07:02:32 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gperiodic/gperiodic-2.0.10.ebuild,v 1.8 2012/09/05 07:03:30 jlec Exp $
 
-EAPI="2"
+EAPI=4
 
-inherit toolchain-funcs eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Periodic table application for Linux"
-SRC_URI="http://www.frantz.fi/software/${P}.tar.gz"
 HOMEPAGE="http://www.frantz.fi/software/gperiodic.php"
+SRC_URI="http://www.frantz.fi/software/${P}.tar.gz"
 
 KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="nls"
 
-RDEPEND=">=sys-libs/ncurses-5.2
+RDEPEND="
+	sys-libs/ncurses:5
 	x11-libs/gtk+:2
 	x11-libs/cairo[X]
 	nls? ( sys-devel/gettext )"
-
 DEPEND="${RDEPEND}
 		virtual/pkgconfig"
 
-src_compile() {
+src_prepare() {
 	# The author has removed "unnecessary automake/autoconf setup"
 
-	sed -i -e "s|-DGTK_DISABLE_DEPRECATED|${CFLAGS}|" Makefile
-	sed -i -e "/make clean/d" Makefile
-	sed -i -e "s|CC=gcc|CC=$(tc-getCC)|" Makefile
+	sed -i -e "s|-DGTK_DISABLE_DEPRECATED|${CFLAGS}|" Makefile || die
+	sed -i -e "/make clean/d" Makefile || die
+	sed -i -e "s|CC=gcc|CC=$(tc-getCC)|" Makefile || die
 	if ! use nls; then
-		sed -i -e "/make -C po/d" Makefile
+		sed -i -e "/make -C po/d" Makefile || die
 	fi
-	emake || die "emake failed!"
 }
 
 src_install() {
-	sed -i -e "s|/usr/bin|${D}/usr/bin|" Makefile
-	sed -i -e "s|/usr/share|${D}/usr/share|" Makefile
-	sed -i -e "s|/usr/share|${D}/usr/share|" po/Makefile
+	sed -i -e "s|/usr/bin|${ED}/usr/bin|" Makefile || die
+	sed -i -e "s|/usr/share|${ED}/usr/share|" Makefile || die
+	sed -i -e "s|/usr/share|${ED}/usr/share|" po/Makefile || die
 
 	# Create directories - Makefile is quite broken.
-	dodir /usr/bin
-	dodir /usr/share/pixmaps
-	dodir /usr/share/applications
-
-	emake install || die "make install failed."
-
-	# Fix permissions
-	chmod 644 "${D}/usr/share/pixmaps/*"
-	chmod 644 "${D}/usr/share/applications/*"
+	dodir \
+		/usr/bin \
+		/usr/share/pixmaps \
+		/usr/share/applications
 
-	# Fix the chemistry category in the .desktop file, bug 97202.
-	sed -i -e "s|Chemestry|Chemistry|" "${D}/usr/share/applications/gperiodic.desktop"
+	default
 
 	# The man page seems to have been removed too.
-#	doman man/gperiodic.1
-	dodoc AUTHORS ChangeLog README NEWS || die
-	newdoc po/README README.translation || die
+	newdoc po/README README.translation
 }