Fixed syntax of replace-cpu-flags according to Bug 115242

(Portage version: 2.0.54-r2)

6 files changed, 93 insertions, 6 deletions

diff --git a/media-libs/plotutils/ChangeLog b/media-libs/plotutils/ChangeLog
index 5e25f0204c14..1d3a1debb5cd 100644
--- a/media-libs/plotutils/ChangeLog
+++ b/media-libs/plotutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/plotutils
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/ChangeLog,v 1.26 2005/12/13 05:34:09 spyderous Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/ChangeLog,v 1.27 2006/05/25 13:11:50 merlin Exp $
+
+*plotutils-2.4.1-r4 (25 May 2006)
+
+  25 May 2006; Cory Visi <visi@gentoo.org> +plotutils-2.4.1-r4.ebuild:
+  Fixed syntax of replace-cpu-flags according to Bug 115242
 
   13 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   plotutils-2.4.1-r3.ebuild:
diff --git a/media-libs/plotutils/Manifest b/media-libs/plotutils/Manifest
index 5991f0318f4f..fe3c6ef371ca 100644
--- a/media-libs/plotutils/Manifest
+++ b/media-libs/plotutils/Manifest
@@ -1,8 +1,10 @@
 MD5 c9c653645f7a213d108ed44590f4e750 ChangeLog 2986
 MD5 f41fecf24623ef77206e245d09f7c9da files/digest-plotutils-2.4.1-r2 68
 MD5 f41fecf24623ef77206e245d09f7c9da files/digest-plotutils-2.4.1-r3 68
+MD5 f41fecf24623ef77206e245d09f7c9da files/digest-plotutils-2.4.1-r4 68
 MD5 37137ec05ee56b449d60098e9dd9c6e9 files/plotutils-2.4.1-gentoo.patch 2619
 MD5 3b5cdbb61e3d7337ad331b2da0e82315 files/plotutils-2.4.1-rangecheck.patch 1858
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 e9d1d653674befccf7ff3a0c623e27b1 plotutils-2.4.1-r2.ebuild 2610
 MD5 3232191d700d5882c34e54f06ca6ca6e plotutils-2.4.1-r3.ebuild 2621
+MD5 acd0957c972fd7d84a9c15c36a03ec8b plotutils-2.4.1-r4.ebuild 2518
diff --git a/media-libs/plotutils/files/digest-plotutils-2.4.1-r4 b/media-libs/plotutils/files/digest-plotutils-2.4.1-r4
new file mode 100644
index 000000000000..e75553aa5a39
--- /dev/null
+++ b/media-libs/plotutils/files/digest-plotutils-2.4.1-r4
@@ -0,0 +1 @@
+MD5 8da2cc2ed5a837cad0753c7843ef18ee plotutils-2.4.1.tar.gz 3316030
diff --git a/media-libs/plotutils/plotutils-2.4.1-r2.ebuild b/media-libs/plotutils/plotutils-2.4.1-r2.ebuild
index b337606f9535..85c0334cc787 100644
--- a/media-libs/plotutils/plotutils-2.4.1-r2.ebuild
+++ b/media-libs/plotutils/plotutils-2.4.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/plotutils-2.4.1-r2.ebuild,v 1.22 2005/02/02 21:41:21 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/plotutils-2.4.1-r2.ebuild,v 1.23 2006/05/25 13:11:50 merlin Exp $
 
 IUSE="X"
 
diff --git a/media-libs/plotutils/plotutils-2.4.1-r3.ebuild b/media-libs/plotutils/plotutils-2.4.1-r3.ebuild
index 1285dbcbfea3..4f35c2a9e391 100644
--- a/media-libs/plotutils/plotutils-2.4.1-r3.ebuild
+++ b/media-libs/plotutils/plotutils-2.4.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/plotutils-2.4.1-r3.ebuild,v 1.14 2005/12/13 05:34:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/plotutils-2.4.1-r3.ebuild,v 1.15 2006/05/25 13:11:50 merlin Exp $
 
 inherit libtool eutils flag-o-matic
 
diff --git a/media-libs/plotutils/plotutils-2.4.1-r4.ebuild b/media-libs/plotutils/plotutils-2.4.1-r4.ebuild
new file mode 100644
index 000000000000..9dbba136c273
--- /dev/null
+++ b/media-libs/plotutils/plotutils-2.4.1-r4.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/plotutils-2.4.1-r4.ebuild,v 1.1 2006/05/25 13:11:50 merlin Exp $
+
+inherit libtool eutils flag-o-matic
+
+#The plotutils package contains extra X fonts.  These fonts are not installed
+#in the current ebuild.  The commented out ebuild lines below are for future
+#reference when this ebuild may be updated to install the fonts.
+#NOTE: The current method does not play nice with X and sandbox.  Most of the
+#font installation procedures should probably be moved to pkg_postinst.
+#See Bug# 30 at http://bugs.gentoo.org/show_bug.cgi?id=30
+
+DESCRIPTION="a powerful C/C++ function library for exporting 2-D vector graphics"
+HOMEPAGE="http://www.gnu.org/software/plotutils/"
+SRC_URI="ftp://ftp.gnu.org/gnu/plotutils/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
+IUSE="X"
+
+DEPEND="media-libs/libpng
+	X? ( || ( ( x11-libs/libXaw
+				x11-proto/xextproto
+			)
+			virtual/x11
+		)
+	)"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/plotutils-2.4.1-gentoo.patch
+	epatch ${FILESDIR}/plotutils-2.4.1-rangecheck.patch
+}
+
+src_compile() {
+	replace-cpu-flags k6 k6-2 k6-3 i586
+	elibtoolize
+
+	#enable build of C++ version
+	local myconf="--enable-libplotter"
+
+	#The following two additional configure options may be of interest
+	#to users with specific printers, i.e. HP LaserJets with PCL 5 or HP-GL/2.
+	#Not sure if enabling screws the pooch for those without these printers.
+	#--enable-ps-fonts-in-pcl --enable-lj-fonts-in-ps
+
+	use X \
+		&& myconf="${myconf} --with-x --enable-libxmi" \
+		|| myconf="${myconf} --without-x"
+
+	econf ${myconf} || die "./configure failed"
+	emake || die "Parallel Make Failed"
+}
+
+src_install() {
+	einstall datadir=${D}/usr/share || die "Installation Failed"
+
+	dodoc AUTHORS COMPAT ChangeLog INSTALL* \
+		KNOWN_BUGS NEWS ONEWS PROBLEMS README THANKS TODO
+}
+
+pkg_postinst() {
+	if [ 'use X' ] ; then
+		einfo "There are extra fonts available in plotutils package."
+		einfo "The current ebuild does not install them for you."
+		einfo "You may want to do so, but you will have to do it"
+		einfo "manually. You are on your own for now."
+		einfo "See /usr/share/doc/${P}/INSTALL.fonts"
+		einfo ""
+		einfo "If you manually install the extra fonts and use the"
+		einfo "program xfig, you might want to recompile to take"
+		einfo "advantage of the additional ps fonts."
+		einfo "Also, it is possible to enable ghostscript and possibly"
+		einfo "your printer to use the HP fonts."
+	fi
+}