Fixed linking, some cosmetics.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.23-gentoo-r9 x86_64

5 files changed, 51 insertions, 64 deletions

diff --git a/sci-visualization/quickplot/ChangeLog b/sci-visualization/quickplot/ChangeLog
index d099f2fb634d..7c9c4d9bbe7a 100644
--- a/sci-visualization/quickplot/ChangeLog
+++ b/sci-visualization/quickplot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/quickplot
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/quickplot/ChangeLog,v 1.6 2008/05/06 14:17:17 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/quickplot/ChangeLog,v 1.7 2008/08/29 10:54:56 bicatali Exp $
+
+  29 Aug 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/quickplot-0.8.13-linking.patch, -quickplot-0.8.5.ebuild,
+  quickplot-0.8.13-r1.ebuild:
+  Fixed linking, some cosmetics.
 
 *quickplot-0.8.13-r1 (06 May 2008)
 
diff --git a/sci-visualization/quickplot/Manifest b/sci-visualization/quickplot/Manifest
index 275931342a85..e6d3c2856038 100644
--- a/sci-visualization/quickplot/Manifest
+++ b/sci-visualization/quickplot/Manifest
@@ -1,9 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX quickplot-0.8.13-gcc43.patch 1527 RMD160 ebaf9b0d3780f93d96fa41f23b7eff8ccc860b20 SHA1 2ae0ea796fb87c91b12d9b712f5bb6e493c71e07 SHA256 a548da4d7c03604ad956ed514d3013488239e697e8ae616f0f09a54ed825e0ba
 AUX quickplot-0.8.13-libsigc++-2.2.patch 10744 RMD160 e43d2a1db835fe297bf22040b6eca4338a58f12c SHA1 ae65dfc6811227687111c6e542c497be54d3e369 SHA256 025cd120ced54d3afb5b638d5765c1719c6d1f28547c420ac2483df33c7a6ec6
+AUX quickplot-0.8.13-linking.patch 647 RMD160 e84eb6e0f05a56ebc312f99246c9fce234d6e019 SHA1 a47d44a5e1a1a700fefb35f4085a107e38638730 SHA256 df9854bd9f920cbef0ffc3c67865ebde1c0ef06f95ccc14ef88c885ebbe78336
 DIST quickplot-0.8.13.tar.bz2 410677 RMD160 34f43f267e7302641e6ef701dc20f65935489023 SHA1 937652a4b3e89026349849ab78298bdd1f5121fc SHA256 52a2a635ae9faebfa114dbd1128a1cfc8e17a1749411c7ff8e39e50064147368
-DIST quickplot-0.8.5.tar.bz2 394128 RMD160 2d0b6829e57a2363532a439a8862c0f2bde54c01 SHA1 f6c11ce0268472c268e3131a2d1dfb9652b72068 SHA256 7015023a003ba370d79766eca2be68f4c5e412ea5ee7f28b18e48992e526d7cc
-EBUILD quickplot-0.8.13-r1.ebuild 1796 RMD160 ec7fff540f9f1877f2e1574b93b4093336df09f7 SHA1 099d6442bd10ddac8add622f9676572e4947a1eb SHA256 598fb4dfa364d77215f9a918b57a8c5826a4e84a6863f3c4ef4446dd6fbe524f
+EBUILD quickplot-0.8.13-r1.ebuild 1795 RMD160 333412910706008eb67be2b37a6a4fc29d39fda7 SHA1 24962d6fc496c3accc86e011502b9f2245c73572 SHA256 e79e48764673f827bf535acba8f69891311a8fb0d2367256245593b23c993ca1
 EBUILD quickplot-0.8.13.ebuild 1680 RMD160 9f943dcde13294d64b329599eab82d452c66574d SHA1 1baa5d22531b4b4255ab3bb80ae97ae8c614d3c3 SHA256 9996bd7258cccce87fdc77b21e9daaa73a0f7cfd598fa92ba4a2f10506c57b70
-EBUILD quickplot-0.8.5.ebuild 1678 RMD160 a5a93df6e55fa77434d4d6ad91b4d70bd0172584 SHA1 ff33bb4b7aca5e495540f1ef6e343ce4f6279e39 SHA256 f58cf1d107bc1d088ed71a4241332d7bfea260d6861f49858c55ca3d265307ea
-MISC ChangeLog 2324 RMD160 5601645b12dc7db78d46d9a2ac9d529f4a9fcc88 SHA1 01d003b80123c9ec074b6b11efd223f258841a83 SHA256 3f4277de5218d344c1a566134a9d52e6d9ddb90065a29f208c16379a746f2845
+MISC ChangeLog 2509 RMD160 5b2e78dba8f2fe618b2981366d1a8f03ac7e9c33 SHA1 237b8f14642ab80586b4c17ad8ddc14102255acf SHA256 df0666d7231ae9682853cfec538135779d6a7b9715e02dfc2f63c9e43496ced5
 MISC metadata.xml 689 RMD160 7dea2ad73d73766b45ef9362abedb6926cac4f42 SHA1 91be130a68ba5d6687df00269e573ec3a5e657d5 SHA256 453a994b73ff78df8302288fdd971892a07a835eaa8b7116400c260c3e1cf343
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAki31YoACgkQ1ycZbhPLE2Do9QCgq+Y4wfXVfggN+EQgjcN2TnmC
+rGwAn3lxtDYxqBCoVx7tq9dJGJNZPbMO
+=HqZr
+-----END PGP SIGNATURE-----
diff --git a/sci-visualization/quickplot/files/quickplot-0.8.13-linking.patch b/sci-visualization/quickplot/files/quickplot-0.8.13-linking.patch
new file mode 100644
index 000000000000..578c4b8be99b
--- /dev/null
+++ b/sci-visualization/quickplot/files/quickplot-0.8.13-linking.patch
@@ -0,0 +1,20 @@
+--- Makefile.in.orig	2008-08-29 11:26:41.000000000 +0100
++++ Makefile.in	2008-08-29 11:32:32.000000000 +0100
+@@ -173,7 +173,7 @@
+ 
+ quickplot_CXXFLAGS = -Wall $(GTKMM_CXXFLAGS) $(SNDFILE_CFLAGS) -DHTMLDIR=\"$(htmldir)\"
+ 
+-quickplot_LDFLAGS = -Wall $(GTKMM_LIBS) $(SNDFILE_LIBS)
++quickplot_LDFLAGS = -Wall
+ # -lefence
+ 
+ # require automake 1.7
+@@ -252,7 +252,7 @@
+ 	quickplot-main.$(OBJEXT) quickplot-parseGeometry.$(OBJEXT) \
+ 	quickplot-usage.$(OBJEXT)
+ quickplot_OBJECTS = $(am_quickplot_OBJECTS)
+-quickplot_LDADD = $(LDADD)
++quickplot_LDADD =  $(GTKMM_LIBS) $(SNDFILE_LIBS)
+ quickplot_DEPENDENCIES =
+ 
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
diff --git a/sci-visualization/quickplot/quickplot-0.8.13-r1.ebuild b/sci-visualization/quickplot/quickplot-0.8.13-r1.ebuild
index 96384e6c2fa5..6484e230bb20 100644
--- a/sci-visualization/quickplot/quickplot-0.8.13-r1.ebuild
+++ b/sci-visualization/quickplot/quickplot-0.8.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/quickplot/quickplot-0.8.13-r1.ebuild,v 1.1 2008/05/06 14:17:17 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/quickplot/quickplot-0.8.13-r1.ebuild,v 1.2 2008/08/29 10:54:57 bicatali Exp $
 
 inherit eutils
 
@@ -14,11 +14,10 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND=">=dev-cpp/gtkmm-2.4.5
-	sndfile? ( >=media-libs/libsndfile-1.0.5 )
-	>=dev-libs/libsigc++-2"
+	sndfile? ( media-libs/libsndfile )"
 
 DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.15"
+	dev-util/pkgconfig"
 
 src_unpack() {
 	unpack ${A}
@@ -26,23 +25,27 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${P}-libsigc++-2.2.patch
 	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-linking.patch
 
 	# Some files have been moved around to more appropriate locations
-	sed -i -e 's|quickplot_icon.png|/usr/share/pixmaps/quickplot.png|' \
+	sed -i \
+		-e 's|quickplot_icon.png|/usr/share/pixmaps/quickplot.png|' \
+		-e  's|href="ChangeLog"|href="../ChangeLog.gz"|' \
 		index.html.in
-	sed -i -e 's|href="ChangeLog"|href="../ChangeLog.gz"|' index.html.in
 	sed -i -e 's|href="COPYING"|href="/usr/portage/licenses/GPL-2"|' \
 		about.html.in
 }
 
 src_compile() {
-	econf `use_with sndfile libsndfile` || die "econf step failed."
+	econf $(use_with sndfile libsndfile) || die "econf step failed."
 	emake htmldir=/usr/share/doc/${PF}/html || die "emake step failed."
 }
 
 src_install () {
-	make install DESTDIR="${D}" htmldir=/usr/share/doc/${PF}/html \
-		|| die "make install step failed."
+	emake \
+		DESTDIR="${D}" \
+		htmldir=/usr/share/doc/${PF}/html \
+		install || die "make install step failed."
 	dodoc AUTHORS ChangeLog README README.devel TODO
 	# Remove COPYING as it is specified in LICENCE. Move other stuff.
 	cd "${D}"/usr/share/doc/${PF}/html
diff --git a/sci-visualization/quickplot/quickplot-0.8.5.ebuild b/sci-visualization/quickplot/quickplot-0.8.5.ebuild
deleted file mode 100644
index d8e8c9a47056..000000000000
--- a/sci-visualization/quickplot/quickplot-0.8.5.ebuild
+++ /dev/null
@@ -1,50 +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/quickplot/quickplot-0.8.5.ebuild,v 1.3 2008/05/06 14:17:17 markusle Exp $
-
-inherit eutils
-
-DESCRIPTION="A fast interactive 2D plotter."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://quickplot.sourceforge.net/"
-
-IUSE="sndfile"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND=">=dev-cpp/gtkmm-2.4.5
-	sndfile? ( >=media-libs/libsndfile-1.0.5 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.15"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Some files have been moved around to more appropriate locations
-	sed -i -e 's|quickplot_icon.png|/usr/share/pixmaps/quickplot.png|' \
-		index.html.in
-	sed -i -e 's|href="ChangeLog"|href="../ChangeLog.gz"|' index.html.in
-	sed -i -e 's|href="COPYING"|href="/usr/portage/licenses/GPL-2"|' \
-		about.html.in
-}
-
-src_compile() {
-	econf `use_with sndfile libsndfile` || die "econf step failed."
-	emake htmldir=/usr/share/doc/${PF}/html || die "emake step failed."
-}
-
-src_install () {
-	make install DESTDIR="${D}" htmldir=/usr/share/doc/${PF}/html \
-		|| die "make install step failed."
-	dodoc AUTHORS ChangeLog README README.devel TODO
-	# Remove COPYING as it is specified in LICENCE. Move other stuff.
-	cd "${D}"/usr/share/doc/${PF}/html
-	rm COPYING quickplot_icon.png ChangeLog
-	mv "${D}"/usr/share/pixmaps/quickplot_icon.png \
-		"${D}"/usr/share/pixmaps/quickplot.png
-	make_desktop_entry 'quickplot --no-pipe' Quickplot quickplot Graphics
-	mv "${D}"/usr/share/applications/quickplot\ --no-pipe.desktop \
-		"${D}"/usr/share/applications/quickplot.desktop
-}