[gentoo-commits] gentoo-x86 commit in sci-chemistry/gperiodic: gperiodic-2.0.7.ebuild ChangeLog gperiodic-2.0.10.ebuild

[Markus Dittrich (markusle)]

markusle    08/05/29 13:29:11

  Modified:             gperiodic-2.0.7.ebuild ChangeLog
  Added:                gperiodic-2.0.10.ebuild
  Log:
  Version bump. Also fixed sed problems and added check for X useflag for cairo (see bug #223875).
  (Portage version: 2.1.5.2)

Revision  Changes    Path
1.6                  sci-chemistry/gperiodic/gperiodic-2.0.7.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/gperiodic/gperiodic-2.0.7.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/gperiodic/gperiodic-2.0.7.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/gperiodic/gperiodic-2.0.7.ebuild?r1=1.5&r2=1.6

Index: gperiodic-2.0.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/gperiodic/gperiodic-2.0.7.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gperiodic-2.0.7.ebuild	21 Apr 2008 01:58:30 -0000	1.5
+++ gperiodic-2.0.7.ebuild	29 May 2008 13:29:10 -0000	1.6
@@ -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 @@
 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!"
 }



1.7                  sci-chemistry/gperiodic/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/gperiodic/ChangeLog?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/gperiodic/ChangeLog?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/gperiodic/ChangeLog?r1=1.6&r2=1.7

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/gperiodic/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChangeLog	20 Sep 2006 05:09:00 -0000	1.6
+++ ChangeLog	29 May 2008 13:29:10 -0000	1.7
@@ -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@g.o> 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@g.o>; metadata.xml:
   (#148281) Change herd to sci-chemistry from sci.



1.1                  sci-chemistry/gperiodic/gperiodic-2.0.10.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/gperiodic/gperiodic-2.0.10.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/gperiodic/gperiodic-2.0.10.ebuild?rev=1.1&content-type=text/plain

Index: gperiodic-2.0.10.ebuild
===================================================================
# 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
}



-- 
gentoo-commits@l.g.o mailing list