4 files changed, 48 insertions, 54 deletions
diff --git a/sci-visualization/xyscan/ChangeLog b/sci-visualization/xyscan/ChangeLog
index 8cd0f7151d9a..6fd9e7732921 100644
--- a/sci-visualization/xyscan/ChangeLog
+++ b/sci-visualization/xyscan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/xyscan
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xyscan/ChangeLog,v 1.3 2009/01/30 09:55:42 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xyscan/ChangeLog,v 1.4 2009/07/22 23:47:31 bicatali Exp $
+
+*xyscan-3.2.1 (22 Jul 2009)
+
+  22 Jul 2009; Sébastien Fabbro <bicatali@gentoo.org> -xyscan-3.02.ebuild,
+  +xyscan-3.2.1.ebuild, -files/xyscan-3.02-docs.patch:
+  Version bump, thanks to Ben Bannier, closing bug #278108
 
 *xyscan-3.1.0 (30 Jan 2009)
 
diff --git a/sci-visualization/xyscan/files/xyscan-3.02-docs.patch b/sci-visualization/xyscan/files/xyscan-3.02-docs.patch
deleted file mode 100644
index a90e368a60b5..000000000000
--- a/sci-visualization/xyscan/files/xyscan-3.02-docs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur xyscan/xyscanWindow.cpp xyscan.new/xyscanWindow.cpp
---- xyscan/xyscanWindow.cpp	2008-03-25 23:52:04.000000000 -0400
-+++ xyscan.new/xyscanWindow.cpp	2008-07-01 09:44:38.000000000 -0400
-@@ -308,7 +308,7 @@
-     QString path = qApp->applicationDirPath() + "/docs";
-     QDir dir(path);
-     if (!dir.exists()) {
--        path = qApp->applicationDirPath() + "/../docs";
-+        path = "/usr/share/doc/GENTOO_P/docs";
-         dir.setPath(path);
-     }
- #if defined(Q_OS_MAC)   
diff --git a/sci-visualization/xyscan/xyscan-3.02.ebuild b/sci-visualization/xyscan/xyscan-3.02.ebuild
deleted file mode 100644
index 2ce568c63907..000000000000
--- a/sci-visualization/xyscan/xyscan-3.02.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xyscan/xyscan-3.02.ebuild,v 1.2 2008/07/04 01:23:09 markusle Exp $
-
-EAPI="1"
-
-inherit qt4
-
-DESCRIPTION="tool for extracting data points from graphs"
-HOMEPAGE="http://star.physics.yale.edu/~ullrich/xyscanDistributionPage/"
-SRC_URI="http://star.physics.yale.edu/~ullrich/${PN}DistributionPage/${PV}/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="|| ( x11-libs/qt-gui:4
-			>=x11-libs/qt-4.3:4 )"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-docs.patch
-	sed -e "s:GENTOO_P:${P}:" -i xyscanWindow.cpp \
-		|| die "Failed to fix docs path"
-}
-
-src_compile() {
-	eqmake4 xyscan.pro
-	emake || die "emake failed"
-}
-
-src_install() {
-	exeinto "/usr/bin"
-	doexe xyscan || die "Failed to install xyscan"
-	insinto "/usr/share/doc/${P}"
-	doins -r docs || die "Failed to install docs"
-}
diff --git a/sci-visualization/xyscan/xyscan-3.2.1.ebuild b/sci-visualization/xyscan/xyscan-3.2.1.ebuild
new file mode 100644
index 000000000000..5e1e5c867197
--- /dev/null
+++ b/sci-visualization/xyscan/xyscan-3.2.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xyscan/xyscan-3.2.1.ebuild,v 1.1 2009/07/22 23:47:31 bicatali Exp $
+
+EAPI=2
+inherit eutils qt4 versionator
+
+MY_PV=$(replace_version_separator 2 '')
+
+DESCRIPTION="Tool for extracting data points from graphs"
+HOMEPAGE="http://star.physics.yale.edu/~ullrich/xyscanDistributionPage/"
+SRC_URI="http://star.physics.yale.edu/~ullrich/${PN}DistributionPage/${MY_PV}/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="|| ( x11-libs/qt-gui:4	>=x11-libs/qt-4.3:4 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	sed -i \
+		-e "s:qApp->applicationDirPath() + \"/../docs\":\"/usr/share/doc/${PF}/html\":" \
+		xyscanWindow.cpp || die "Failed to fix docs path"
+}
+
+src_configure() {
+	eqmake4 xyscan.pro
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe xyscan || die "Failed to install xyscan"
+	insinto /usr/share/doc/${PF}/html
+	doins -r docs/* || die "Failed to install docs"
+	newicon images/xyscanIcon.png xyscan.png
+	make_desktop_entry xyscan "xyscan data point extractor"
+}