Version bump. Also fixed sed problems and added check for X useflag for cairo (see bug #223875).

Package-Manager: portage-2.1.5.2

4 files changed, 87 insertions, 8 deletions

diff --git a/sci-chemistry/gperiodic/ChangeLog b/sci-chemistry/gperiodic/ChangeLog
index 2eeb0fe146b4..cf5308838247 100644
--- a/sci-chemistry/gperiodic/ChangeLog
+++ b/sci-chemistry/gperiodic/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/gperiodic
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gperiodic/ChangeLog,v 1.6 2006/09/20 05:09:00 dberkholz Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gperiodic/ChangeLog,v 1.7 2008/05/29 13:29:10 markusle Exp $
+
+*gperiodic-2.0.10 (29 May 2008)
+
+  29 May 2008; Markus Dittrich <markusle@gentoo.org> gperiodic-2.0.7.ebuild,
+  +gperiodic-2.0.10.ebuild:
+  Version bump. Also fixed sed problems and added check for X useflag for
+  cairo (see bug #223875).
 
   20 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; metadata.xml:
   (#148281) Change herd to sci-chemistry from sci.
diff --git a/sci-chemistry/gperiodic/Manifest b/sci-chemistry/gperiodic/Manifest
index 1cffdeda69f4..de7511244597 100644
--- a/sci-chemistry/gperiodic/Manifest
+++ b/sci-chemistry/gperiodic/Manifest
@@ -1,5 +1,7 @@
 AUX gperiodic-1.3.2-gentoo.diff 2000 RMD160 0c16f8c006421282bfd0f838106157645113c464 SHA1 c592e6c5415aff940d3116e9f3e2eaa1ace5d9fe SHA256 856cb21ba1cf403f200aa962becbcee06e7be4d53b08c51af692609774ecde75
+DIST gperiodic-2.0.10.tar.gz 131213 RMD160 9a4a16c4578342b4044d93e3327623cec98c762e SHA1 ce7a4d5271aaf283afa0c8299b2ee9b04da257fe SHA256 78d72870c51c39e4a35c804c05b8ef5e39f88d42eced52b2934e21d74fb8d096
 DIST gperiodic-2.0.7.tar.gz 124798 RMD160 0e2f0dff05005c7c018bd996b1957b841de80fff SHA1 fa1277c4f1d34fbdb2da95b38a6b7f59e23caf03 SHA256 e7cdb11effa7e3adbf5ac60a16b5092359093ffa93282f25a6855094a0fa250f
-EBUILD gperiodic-2.0.7.ebuild 1681 RMD160 00108e4ba7d279c9d1879d0805a156454b4c2079 SHA1 e84f475aa4df492b47bba6065af0389166e256d1 SHA256 42219366b1bb7f5253c571f8dae5e91eb816bb1818e235f33886a45334627f57
-MISC ChangeLog 2071 RMD160 927aae196edda9b0ffd91c4110eed1b2d6add8c2 SHA1 49f410556464e357bc42320a7a6fda8622da18ed SHA256 33748973aef46dbb4be774333f48c63f8a874ab92d3ff9d04d296375045b0559
+EBUILD gperiodic-2.0.10.ebuild 1820 RMD160 7a895c7dcda4a47a696792e66073962350959a32 SHA1 3e63cd69cf28a08e20bc9a404cf443b969984f27 SHA256 eb5c0cc462139bd170658dcf67007c92fe7f1808574e7968664c750a30a419c1
+EBUILD gperiodic-2.0.7.ebuild 1817 RMD160 cedceec50a1cc67add43c8c0df6eec85e0a8626c SHA1 608f5fda6bdc5ae01644276aca4af3528652e621 SHA256 087a41b6b415a8c3bbb6523a3ff3c2e7f9defa8744d3966e0b078d68431a79d1
+MISC ChangeLog 2310 RMD160 54aa4d8df73b364c08a05b2aebf6237b94005971 SHA1 37fbc2912bba27a8ee4baf7102f188f022e24a0b SHA256 08c7cb274bfe1317417d83d8e7bdaadbf68d23fede7a82eb13f10e7ec4d23693
 MISC metadata.xml 449 RMD160 f729533701c1f711ef23da25787579b8952e610d SHA1 7b42297a4a1772556d1d47b450e47fe8825f9ea3 SHA256 209c4986684787bdf9ff4b189ed78fc586602c06297da01f311ac2d4ef8c7fa4
diff --git a/sci-chemistry/gperiodic/gperiodic-2.0.10.ebuild b/sci-chemistry/gperiodic/gperiodic-2.0.10.ebuild
new file mode 100644
index 000000000000..56bbf366476d
--- /dev/null
+++ b/sci-chemistry/gperiodic/gperiodic-2.0.10.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2008 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.1 2008/05/29 13:29:10 markusle Exp $
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Periodic table application for Linux"
+SRC_URI="http://www.acclab.helsinki.fi/~frantz/software/${P}.tar.gz"
+HOMEPAGE="http://www.acclab.helsinki.fi/~frantz/software/gperiodic.php"
+
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="nls"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	=x11-libs/gtk+-2*
+	nls? ( sys-devel/gettext )"
+
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig"
+
+pkg_setup() {
+	if ! built_with_use x11-libs/cairo X; then
+		die "gperiodic needs x11-libs/cairo emerged with USE=\"X\""
+	fi
+}
+
+src_compile() {
+	# 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
+	if ! use nls; then
+		sed -i -e "/make -C po/d" Makefile
+	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
+
+	# Create directories - Makefile is quite broken.
+	dodir /usr/bin
+	dodir /usr/share/pixmaps
+	dodir /usr/share/applications
+
+	make install || die "make install failed."
+
+	# Fix permissions
+	chmod 644 "${D}/usr/share/pixmaps/*"
+	chmod 644 "${D}/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"
+
+	# The man page seems to have been removed too.
+#	doman man/gperiodic.1
+	dodoc AUTHORS ChangeLog README NEWS
+	newdoc po/README README.translation
+}
diff --git a/sci-chemistry/gperiodic/gperiodic-2.0.7.ebuild b/sci-chemistry/gperiodic/gperiodic-2.0.7.ebuild
index b6f03287be70..81229d39e038 100644
--- a/sci-chemistry/gperiodic/gperiodic-2.0.7.ebuild
+++ b/sci-chemistry/gperiodic/gperiodic-2.0.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gperiodic/gperiodic-2.0.7.ebuild,v 1.5 2008/04/21 01:58:30 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gperiodic/gperiodic-2.0.7.ebuild,v 1.6 2008/05/29 13:29:10 markusle Exp $
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 DESCRIPTION="Periodic table application for Linux"
 SRC_URI="http://www.acclab.helsinki.fi/~frantz/software/${P}.tar.gz"
@@ -20,14 +20,20 @@ RDEPEND=">=sys-libs/ncurses-5.2
 DEPEND="${RDEPEND}
 		dev-util/pkgconfig"
 
+pkg_setup() {
+	if ! built_with_use x11-libs/cairo X; then
+		die "gperiodic needs x11-libs/cairo emerged with USE=\"X\""
+	fi
+}
+
 src_compile() {
 	# 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 "/make clean/d" Makefile
 	sed -i -e "s|CC=gcc|CC=$(tc-getCC)|" Makefile
 	if ! use nls; then
-		sed -i -e "|make -C po|d" Makefile
+		sed -i -e "/make -C po/d" Makefile
 	fi
 	emake || die "emake failed!"
 }