From 943881b77084667a84f6928f9354f22f6b797694 Mon Sep 17 00:00:00 2001
From: Sebastien Fabbro <bicatali@gentoo.org>
Date: Wed, 30 Apr 2008 15:37:37 +0000
Subject: Fixed installation for binary and translations, closing bug #219845
 (Portage version: 2.1.5_rc6)

---
 sci-visualization/qtiplot/ChangeLog                |  8 +-
 .../qtiplot/files/qtiplot-0.9.5-profile.patch      | 11 ++-
 sci-visualization/qtiplot/qtiplot-0.9.5-r1.ebuild  | 99 ++++++++++++++++++++++
 sci-visualization/qtiplot/qtiplot-0.9.5.ebuild     | 96 ---------------------
 4 files changed, 116 insertions(+), 98 deletions(-)
 create mode 100644 sci-visualization/qtiplot/qtiplot-0.9.5-r1.ebuild
 delete mode 100644 sci-visualization/qtiplot/qtiplot-0.9.5.ebuild

(limited to 'sci-visualization')

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index f7836281bf46..995987c60839 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/qtiplot
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.21 2008/04/29 14:55:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.22 2008/04/30 15:37:36 bicatali Exp $
+
+*qtiplot-0.9.5-r1 (30 Apr 2008)
+
+  30 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  files/qtiplot-0.9.5-profile.patch, +qtiplot-0.9.5-r1.ebuild:
+  Fixed installation for binary and translations, closing bug #219845
 
 *qtiplot-0.9.5 (29 Apr 2008)
 
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.5-profile.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.5-profile.patch
index 9bb8957130b1..efc660a08f4f 100644
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.5-profile.patch
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.5-profile.patch
@@ -1,5 +1,14 @@
 --- qtiplot/qtiplot.pro.orig	2008-04-24 18:54:47.622675411 +0000
-+++ qtiplot/qtiplot.pro	2008-04-24 19:01:18.639824832 +0000
++++ qtiplot/qtiplot.pro	2008-04-30 15:23:34.648191881 +0000
+@@ -20,7 +20,7 @@
+ # Uncomment the following line if you want to perform a custom installation using 
+ # the *.path variables defined bellow. 
+ ######################################################################################
+-#CONFIG          += CustomInstall
++CONFIG          += CustomInstall
+ 
+ CONFIG          += release
+ #CONFIG          += debug
 @@ -30,12 +30,11 @@
  #!!! Warning: You must modify these paths according to your computer settings
  #############################################################################
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.5-r1.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..3ffc85daada1
--- /dev/null
+++ b/sci-visualization/qtiplot/qtiplot-0.9.5-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.5-r1.ebuild,v 1.1 2008/04/30 15:37:36 bicatali Exp $
+
+EAPI="1"
+inherit eutils multilib qt4
+
+DESCRIPTION="Qt based clone of the Origin plotting package"
+HOMEPAGE="http://soft.proindependent.com/qtiplot.html"
+SRC_URI="http://soft.proindependent.com/src/${P}.tar.bz2
+	doc? ( mirror://gentoo/${P}-manual-en.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="python doc bindist"
+
+LANGS="de es fr ja ru sv"
+for l in ${LANGS}; do
+	IUSE="${IUSE} linguas_${l}"
+done
+
+CDEPEND=">=x11-libs/qwt-5.0.2
+	>=x11-libs/qwtplot3d-0.2.7
+	>=dev-cpp/muParser-1.28
+	>=sci-libs/liborigin-20080225
+	!bindist? ( sci-libs/gsl )
+	bindist? ( <sci-libs/gsl-1.10 )"
+
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig
+	python? ( >=dev-python/sip-4.5.2 )"
+
+RDEPEND="${CDEPEND}
+	python? ( >=dev-lang/python-2.5
+		dev-python/PyQt4
+		dev-python/pygsl
+		sci-libs/scipy )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-profile.patch
+	epatch "${FILESDIR}"/${P}-fitplugins.patch
+
+	sed -i \
+		-e '/manual/d'\
+		-e '/3rd/d' \
+		qtiplot.pro || die "sed qtiplot.pro failed"
+	sed -i \
+		-e '/manual/d' \
+		-e "s:doc/${PN}:doc/${PF}:" \
+		qtiplot/qtiplot.pro || die " sed for qtiplot/qtiplot.pro failed"
+
+	if ! use python; then
+		sed -i \
+			-e '/^SCRIPTING_LANGS += Python/d' \
+			-e '/sipcmd/d' \
+			qtiplot/qtiplot.pro || die "sed for python option failed"
+	fi
+
+	# the lib$$suff did not work in the fitRational*.pro files
+	sed -i \
+		-e "s|/usr/lib\$\${libsuff}|/usr/$(get_libdir)|g" \
+		fitPlugins/fit*/fitRational*.pro \
+		|| die "sed fitRational* failed"
+
+	for l in ${LANGS}; do
+		if ! use linguas_${l}; then
+			sed -i \
+				-e "s:translations/qtiplot_${l}.ts::" \
+				qtiplot/qtiplot.pro || die
+		fi
+	done
+}
+
+src_compile() {
+	eqmake4 || die "eqmake4 failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die 'emake install failed'
+
+	newicon qtiplot_logo.png qtiplot.png
+	make_desktop_entry qtiplot QtiPlot qtiplot
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}/html
+		doins -r "${WORKDIR}"/qtiplot-manual-en/* \
+			|| die "install manual failed"
+	fi
+
+	if use python; then
+		insinto /etc
+		doins qtiplot/{qtiplotrc,qtiUtil}.py \
+			|| die "install python config failed"
+	fi
+}
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.5.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.5.ebuild
deleted file mode 100644
index 78f046c55fe2..000000000000
--- a/sci-visualization/qtiplot/qtiplot-0.9.5.ebuild
+++ /dev/null
@@ -1,96 +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/qtiplot/qtiplot-0.9.5.ebuild,v 1.1 2008/04/29 14:55:52 bicatali Exp $
-
-EAPI="1"
-inherit eutils multilib qt4
-
-DESCRIPTION="Qt based clone of the Origin plotting package"
-HOMEPAGE="http://soft.proindependent.com/qtiplot.html"
-SRC_URI="http://soft.proindependent.com/src/${P}.tar.bz2
-	doc? ( mirror://gentoo/${P}-manual-en.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="python doc bindist"
-
-LANGS="de es fr ja ru sv"
-for l in ${LANGS}; do
-	IUSE="${IUSE} linguas_${l}"
-done
-
-CDEPEND=">=x11-libs/qwt-5.0.2
-	>=x11-libs/qwtplot3d-0.2.7
-	>=dev-cpp/muParser-1.28
-	>=sci-libs/liborigin-20080225
-	!bindist? ( sci-libs/gsl )
-	bindist? ( <sci-libs/gsl-1.10 )"
-
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig
-	python? ( >=dev-python/sip-4.5.2 )"
-
-RDEPEND="${CDEPEND}
-	python? ( >=dev-lang/python-2.5
-		dev-python/PyQt4
-		dev-python/pygsl
-		sci-libs/scipy )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-profile.patch
-	epatch "${FILESDIR}"/${P}-fitplugins.patch
-
-	sed -i \
-		-e '/manual/d'\
-		-e '/3rd/d' \
-		qtiplot.pro || die "sed qtiplot.pro failed"
-
-	if ! use python; then
-		sed -i \
-			-e '/^SCRIPTING_LANGS += Python/d' \
-			-e '/sipcmd/d' \
-			qtiplot/qtiplot.pro || die "sed for python option failed"
-	fi
-
-	# the lib$$suff did not work in the fitRational*.pro files
-	sed -i \
-		-e "s|/usr/lib\$\${libsuff}|/usr/$(get_libdir)|g" \
-		fitPlugins/fit*/fitRational*.pro \
-		|| die "sed fitRational* failed"
-
-	for l in ${LANGS}; do
-		if ! use linguas_${l}; then
-			sed -i \
-				-e "s:translations/qtiplot_${l}.ts::" \
-				qtiplot/qtiplot.pro || die
-		fi
-	done
-}
-
-src_compile() {
-	eqmake4 || die "eqmake4 failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die 'emake install failed'
-
-	newicon qtiplot_logo.png qtiplot.png
-	make_desktop_entry qtiplot QtiPlot qtiplot
-	doman qtiplot.1 || die "doman failed"
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}/html
-		doins -r "${WORKDIR}"/qtiplot-manual-en/* \
-			|| die "install manual failed"
-	fi
-
-	if use python; then
-		insinto /etc
-		doins qtiplot/{qtiplotrc,qtiUtil}.py \
-			|| die "install python config failed"
-	fi
-}
-- 
cgit v1.2.3-65-gdbad