4 files changed, 26 insertions, 65 deletions
diff --git a/sci-visualization/g3data/ChangeLog b/sci-visualization/g3data/ChangeLog
index 8bbba0d5e9b1..50d0423260ef 100644
--- a/sci-visualization/g3data/ChangeLog
+++ b/sci-visualization/g3data/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/g3data
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/g3data/ChangeLog,v 1.11 2012/05/04 08:06:59 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/g3data/ChangeLog,v 1.12 2012/08/06 23:57:35 bicatali Exp $
+
+*g3data-1.5.4 (06 Aug 2012)
+
+  06 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> +g3data-1.5.4.ebuild,
+  -files/g3data-1.5.1-makefile.patch, -g3data-1.5.1.ebuild:
+  Version bump
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> g3data-1.5.1.ebuild,
   g3data-1.5.3.ebuild:
@@ -54,4 +60,3 @@
   Initial import, moved from the science overlay, originally from bug 50565.
   Thanks to Jonathan S. Romero <jonnyro@jonnyro.isa-geek.com> and Maxim
   Loginov <Zeliboba@mail.ru> for their work on the initial ebuild.
-
diff --git a/sci-visualization/g3data/files/g3data-1.5.1-makefile.patch b/sci-visualization/g3data/files/g3data-1.5.1-makefile.patch
deleted file mode 100644
index f83ca596c6e6..000000000000
--- a/sci-visualization/g3data/files/g3data-1.5.1-makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.orig	2008-11-27 18:16:03.000000000 +0000
-+++ Makefile	2008-11-27 18:17:05.000000000 +0000
-@@ -1,15 +1,13 @@
--CC=gcc
--CFLAGS=-Wall `pkg-config --cflags gtk+-2.0`
-+MYCFLAGS=-Wall `pkg-config --cflags gtk+-2.0`
- LIBS=`pkg-config --libs gtk+-2.0`
- bindir ?= /usr/bin
- mandir ?= /usr/share/man
- 
- .c.o:
--	$(CC) -c $(CFLAGS) $(CPPFLAGS) $<
-+	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(MYCFLAGS) $<
- 
- g3data: main.o sort.o points.o drawing.o g3data.1.gz
--	$(CC) $(CFLAGS) -o g3data main.o sort.o points.o drawing.o $(LIBS)
--	strip g3data
-+	$(CC) $(CFLAGS) $(MYCFLAGS) -o g3data main.o sort.o points.o drawing.o $(LIBS)
- 
- main.o: main.c main.h strings.h vardefs.h
- 
diff --git a/sci-visualization/g3data/g3data-1.5.1.ebuild b/sci-visualization/g3data/g3data-1.5.1.ebuild
deleted file mode 100644
index db9806bbf26d..000000000000
--- a/sci-visualization/g3data/g3data-1.5.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/g3data/g3data-1.5.1.ebuild,v 1.5 2012/05/04 08:06:59 jdhore Exp $
-
-EAPI="1"
-inherit eutils
-
-DESCRIPTION="Tool for extracting data from graphs"
-HOMEPAGE="http://www.frantz.fi/software/g3data.php"
-SRC_URI="http://www.frantz.fi/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	~app-text/docbook-sgml-utils-0.6.14"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin g3data || die "dobin failed - no binary!"
-	doman g3data.1.gz || die "doman failed"
-	dodoc README.SOURCE || die "README.SOURCE not found"
-	if use examples; then
-		docinto examples
-		dodoc README.TEST
-		insinto /usr/share/doc/${PF}/examples
-		doins test1.png test1.values test2.png test2.values
-	fi
-}
diff --git a/sci-visualization/g3data/g3data-1.5.4.ebuild b/sci-visualization/g3data/g3data-1.5.4.ebuild
new file mode 100644
index 000000000000..8ea6d880de24
--- /dev/null
+++ b/sci-visualization/g3data/g3data-1.5.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/g3data/g3data-1.5.4.ebuild,v 1.1 2012/08/06 23:57:35 bicatali Exp $
+
+EAPI=4
+inherit autotools-utils eutils
+
+DESCRIPTION="Tool for extracting data from graphs"
+HOMEPAGE="http://www.frantz.fi/software/g3data.php"
+SRC_URI="https://github.com/downloads/pn2200/g3data/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"