Version bump for bug #300559. Update info about extra fonts (bug #256086 by Martin Mokrejš), bump to EAPI=3, add png and static-libs USE flags, set RDEPEND=, apply patch to fix sandbox issues, remove old CFLAGS replacement, and use emake rather than einstall.

Package-Manager: portage-2.2_rc98/cvs/Linux x86_64

4 files changed, 169 insertions, 3 deletions

diff --git a/media-libs/plotutils/ChangeLog b/media-libs/plotutils/ChangeLog
index 06bae775b422..631872f0d487 100644
--- a/media-libs/plotutils/ChangeLog
+++ b/media-libs/plotutils/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/plotutils
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/ChangeLog,v 1.51 2009/01/07 15:58:17 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/ChangeLog,v 1.52 2010/10/26 22:18:13 radhermit Exp $
+
+*plotutils-2.6 (26 Oct 2010)
+
+  26 Oct 2010; Tim Harder <radhermit@gentoo.org> +plotutils-2.6.ebuild,
+  +files/plotutils-2.6-makefile.patch:
+  Version bump for bug #300559. Update info about extra fonts (bug #256086
+  by Martin Mokrejš), bump to EAPI=3, add png and static-libs USE flags,
+  set RDEPEND=, apply patch to fix sandbox issues, remove old CFLAGS
+  replacement, and use emake rather than einstall.
 
   07 Jan 2009; Brent Baude <ranger@gentoo.org> plotutils-2.5.1.ebuild:
   stable ppc64, bug 245690
diff --git a/media-libs/plotutils/Manifest b/media-libs/plotutils/Manifest
index bf08d6250646..989893b80c3d 100644
--- a/media-libs/plotutils/Manifest
+++ b/media-libs/plotutils/Manifest
@@ -1,14 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX plotutils-2.4.1-correct_test.patch 693 RMD160 6651493db76b5151fab648e9f7407f09cc72d3d4 SHA1 22990ee2bc25d633f8e44261af3621fb5f7070ce SHA256 5a029cdfb118977236c09f9ca1d9214ffa1fbbd7279ac414b2154281daf5cf8d
 AUX plotutils-2.4.1-gentoo.patch 2619 RMD160 369fe57883906de848cc4dbf3ce87658ec5fa12a SHA1 eaa92cc7a0d83e61b2db4bdcf20dfb6f68a67e7c SHA256 c736cc1e56c2b0e87bd2974288d2da7b1f235ca161a4bf638e7c5fdaae752534
 AUX plotutils-2.4.1-rangecheck.patch 1858 RMD160 bd7e70840a7031fe85419be38d6d77dfde585f1b SHA1 d00a9d7067d3c22ae444213312e8f313923d8801 SHA256 79db278a29e1332bd2c1025d916906766032e30d9cf43a91ff6018a81f9a629c
 AUX plotutils-2.5-rangecheck.patch 1054 RMD160 55403e9c62f5a4e7b501c2a2edf3bc53bd6fa6e6 SHA1 03ab4724638e1201824dc24e069aecd6ee59e1f3 SHA256 f500b59d3262c54dcae740617a9c8b4fc3d1c64393f3735eb33feb6f1b08fd94
 AUX plotutils-2.5.1-fix-tests.patch 3155 RMD160 b6ad91763473db2c64eb088686eabbc290286b30 SHA1 414ac884a8d3391ea7e3eb2186370437192dee05 SHA256 b0d48766fcf3410f6f9a539e27ddccbea72fc72f4227c00f2d2fd7cd7c2d06d7
 AUX plotutils-2.5.1-rangecheck.patch 792 RMD160 238adf7049b776a609a5dfa7ae5864f554054e3c SHA1 8e233a9960631abfe90c6c1a672be33b014fd657 SHA256 492e98caa77ab7b7baa80d5b2a1b0a92f4042bcdf13ee73f6c9155ffb363f43a
+AUX plotutils-2.6-makefile.patch 2921 RMD160 3856f8a90e26ae715420a3333f081b7d895e2262 SHA1 2e44af9522edeaee0e89dc6bac72c967098c0792 SHA256 d94474025b8f71ff28fdc65a49343defa87074383349b4679dc6e1a9315d0f4d
 DIST plotutils-2.4.1.tar.gz 3316030 RMD160 02dd8d914cc769e10beb2e556efb7fe76350370d SHA1 e39ce89048a578683ad76f3284bb79adfb0adc22 SHA256 117638fb606a2ab56147f7e72bc872f6a65eee492ff2430e1f9d614acae50668
 DIST plotutils-2.5.1.tar.gz 3630999 RMD160 f6ee967ea32818f63d6ccf2c581ed0c2963a52ea SHA1 19e27da53f2c3b6227584c6bdf88759f217926f0 SHA256 c6a54c7089d3b9ede8584b8dc30fbd2efc9a99efa426f3ab5e7e947921839cf1
 DIST plotutils-2.5.tar.gz 3686955 RMD160 106ee9c827fc6eef99762f88afb0f85a42e2e300 SHA1 156c2a4d3a950d627ff2fb50dffe9a098cbc50a1 SHA256 b402546feb34f6762faf26aa7c621c6261f79d2eb4d9a2b26824855203c26826
+DIST plotutils-2.6.tar.gz 3657562 RMD160 2a32244eb20e00b82a0742dde7b690f688e82774 SHA1 7921301d9dfe8991e3df2829bd733df6b2a70838 SHA256 4f4222820f97ca08c7ea707e4c53e5a3556af4d8f1ab51e0da6ff1627ff433ab
 EBUILD plotutils-2.4.1-r4.ebuild 2615 RMD160 0f67113c6edee1119755d24a354c18cd2c79e4ad SHA1 4b8029b7076ee513400ffbf1f0eac13787e8e64c SHA256 1f8f22145369683bedc7bf04b7d2669bd1d02b9017b78a3a89a7ae99fe8e8bc2
 EBUILD plotutils-2.5.1.ebuild 2555 RMD160 ae2715330cc97b396aaeb35ba44a237fc39a49ba SHA1 ca6f01c87b537e7a831d2e200c994123b9b443e0 SHA256 6c3d44f45c252ffa84bfa090bda02dd2ee1b8b83dacae6bed82433ad0eee0ac1
 EBUILD plotutils-2.5.ebuild 2517 RMD160 7fe0cdfe5f967e7c9e40931c5bd37f37fb725db6 SHA1 241b7c45020e3e1bf67bee70f3b98cb43920c7e4 SHA256 c87a3013e090d4c1e0552323e64ccfd9d6ec1f7fa72f39127926be8324f079f9
-MISC ChangeLog 6393 RMD160 cd6c1bb30aab1b36dca1d1f901a37e27c323f9c3 SHA1 0da4a483bce2b5bccda51defebf3b2f19e295861 SHA256 e9cfe441003b8931e5bcc3f633a7bd2e5e06722e131701020c2cee23add4e0c9
+EBUILD plotutils-2.6.ebuild 1943 RMD160 b79a2b9146a10b63c390ae05c34dbba9caa191ac SHA1 46fb173b33eab8d878505d76bd3e676e7859ea7c SHA256 19b0a7d1f0cc4604804b2d6cb3011d7c3c7a1cfbefb33815ff1b2905d0539945
+MISC ChangeLog 6807 RMD160 b676bf5b2eee792c1d8457e149088fa7ed74aefe SHA1 b8405c2eb244839b458dd3c8766ef24205abbdc0 SHA256 bf805464bea673f8c44a7b4dbfa3b71ea8a04594657bb464b790b080d290bc67
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQEcBAEBAgAGBQJMx1OxAAoJEEqz6FtPBkyjOVMH/2841e/beNoocYrfrDuZD60P
+ZtVqBbEsES7z2AVWjO8XyUfyXLNhrN/Fj6X8U1BajKfUxD18Y4AI2xJVg60NId+J
+TZMfc5ozWcaGII7qbXBt87WscFboaKkTrmB7TRd+9ZLqHQj95lyhbpXOsHfMYRX+
+UOsJJA6r+opRqD4l9XqT/3YJ9v2vujJbIBi2FxOJDQocEZRjXWh1KBk8219KZfQn
+HIrb57wRUW6kga1CywAOKXLMMYDyAt3n7ccPvhi/Ubm/qvkI0v+Q8nhTGUE4n8s6
+abkx5CQsoZj3SpfyRpyh3rdzwVnbHqSbcCHw8HB2q9Yfldwef4esRhgaKSVVkmM=
+=iBlj
+-----END PGP SIGNATURE-----
diff --git a/media-libs/plotutils/files/plotutils-2.6-makefile.patch b/media-libs/plotutils/files/plotutils-2.6-makefile.patch
new file mode 100644
index 000000000000..a78801f3cf79
--- /dev/null
+++ b/media-libs/plotutils/files/plotutils-2.6-makefile.patch
@@ -0,0 +1,73 @@
+--- plotutils-2.6.orig/configure.ac	2009-07-29 20:14:09.000000000 -0700
++++ plotutils-2.6/configure.ac	2010-10-18 01:46:57.328444564 -0700
+@@ -65,6 +65,8 @@
+ # SCO OpenServer 5 (i.e. *-*-sco3.2v5*), "-belf" is added.
+ AC_PROG_LIBTOOL
+ 
++AC_PROG_CXX
++
+ # Determine extension (e.g. ".exe") on executables, if any.
+ AC_EXEEXT
+ 
+--- plotutils-2.6.orig/doc/Makefile.am	2009-07-30 08:49:46.000000000 -0700
++++ plotutils-2.6/doc/Makefile.am	2010-10-18 01:57:50.525852285 -0700
+@@ -3,11 +3,3 @@
+ 
+ # files with nonstandard names in this directory
+ EXTRA_DIST = colors.txt h-fonts.txt h-glyphs.txt hershey.bib kana.txt kanji.txt
+-
+-# remove documentation files installed by previous versions of the package,
+-# with obsolete names
+-
+-OBSOLETEDOC = hershey-demo.c hershey-fonts hershey-number hershey.doc h-fonts.doc h-glyphs.doc kana.doc kanji.doc demo-page h-demo.c
+-
+-install-data-hook:
+-	-for f in $(OBSOLETEDOC) ; do rm -f $(datadir)/libplot/$$f; done
+--- plotutils-2.6.orig/graph/Makefile.am	2005-11-25 20:40:13.000000000 -0800
++++ plotutils-2.6/graph/Makefile.am	2010-10-18 01:23:07.194720342 -0700
+@@ -10,15 +10,5 @@
+ 
+ CLEANFILES = fontlist.c
+ 
+-# remove executables installed by previous versions of the package, and
+-# remove obsolete library versions too
+-
+-OBSOLETEBINS = graph-tek graph-hpgl graph-fig graph-ps graph-X
+-OBSOLETELIBS = libplottek.a libplothpgl.a libplotfig.a libplotps.a libplotX.a
+-
+-install-exec-hook:
+-	-for f in $(OBSOLETEBINS) ; do rm -f $(bindir)/$$f; done
+-	-for f in $(OBSOLETELIBS) ; do rm -f $(libdir)/$$f; done
+-
+ fontlist.c: $(top_srcdir)/lib/fontlist.c
+ 	@rm -f fontlist.c ; if $(LN_S) $(top_srcdir)/lib/fontlist.c fontlist.c ; then true ; else cp -p $(top_srcdir)/lib/fontlist.c fontlist.c ; fi
+--- plotutils-2.6.orig/plot/Makefile.am	2005-11-25 20:40:13.000000000 -0800
++++ plotutils-2.6/plot/Makefile.am	2010-10-18 01:23:37.714971379 -0700
+@@ -9,12 +9,5 @@
+ 
+ CLEANFILES = fontlist.c
+ 
+-# remove executables installed by previous versions of the package
+-
+-OBSOLETEBINS = plot2plot plot2tek plot2hpgl plot2fig plot2ps plot2X
+-
+-install-exec-hook:
+-	-for f in $(OBSOLETEBINS) ; do rm -f $(bindir)/$$f; done
+-
+ fontlist.c: $(top_srcdir)/lib/fontlist.c
+ 	@rm -f fontlist.c ; if $(LN_S) $(top_srcdir)/lib/fontlist.c fontlist.c ; then true ; else cp -p $(top_srcdir)/lib/fontlist.c fontlist.c ; fi
+--- plotutils-2.6.orig/tek2plot/Makefile.am	2005-11-25 20:40:13.000000000 -0800
++++ plotutils-2.6/tek2plot/Makefile.am	2010-10-18 01:23:48.011056089 -0700
+@@ -12,12 +12,5 @@
+ 
+ SUBDIRS = teksamples
+ 
+-# remove executables installed by previous versions of the package
+-
+-OBSOLETEBINS = tek2tek tek2hpgl tek2fig tek2ps tek2X
+-
+-install-exec-hook:
+-	-for f in $(OBSOLETEBINS) ; do rm -f $(bindir)/$$f; done
+-
+ fontlist.c: $(top_srcdir)/lib/fontlist.c
+ 	@rm -f fontlist.c ; if $(LN_S) $(top_srcdir)/lib/fontlist.c fontlist.c ; then true ; else cp -p $(top_srcdir)/lib/fontlist.c fontlist.c ; fi
diff --git a/media-libs/plotutils/plotutils-2.6.ebuild b/media-libs/plotutils/plotutils-2.6.ebuild
new file mode 100644
index 000000000000..efbf2e63a65d
--- /dev/null
+++ b/media-libs/plotutils/plotutils-2.6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/plotutils-2.6.ebuild,v 1.1 2010/10/26 22:18:13 radhermit Exp $
+
+EAPI=3
+inherit libtool eutils autotools
+
+DESCRIPTION="a powerful C/C++ function library for exporting 2-D vector graphics"
+HOMEPAGE="http://www.gnu.org/software/plotutils/"
+SRC_URI="mirror://gnu/plotutils/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+IUSE="+png static-libs X"
+
+DEPEND="png? ( media-libs/libpng
+		sys-libs/zlib )
+	X? ( x11-libs/libXaw
+		x11-proto/xextproto )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.5.1-rangecheck.patch"
+	epatch "${FILESDIR}/${P}-makefile.patch"
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	local myconf
+	if use X ; then
+		myconf="--with-x --enable-libxmi"
+	else
+		myconf="--without-x"
+	fi
+
+	econf \
+		--disable-dependency-tracking \
+		--enable-shared \
+		--enable-libplotter \
+		$(use_enable static-libs static) \
+		$(use_with png libpng) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS COMPAT ChangeLog INSTALL.* \
+		KNOWN_BUGS NEWS ONEWS PROBLEMS README THANKS TODO
+}
+
+pkg_postinst() {
+	if use X ; then
+		elog "There are extra fonts available in the plotutils package."
+		elog "The current ebuild does not install them for you since most"
+		elog "of them can be installed via the media-fonts/urw-fonts"
+		elog "package. See /usr/share/doc/${P}/INSTALL.fonts for"
+		elog "information on installing the remaining Tektronix fonts."
+		elog ""
+		elog "If you manually install the extra fonts and use the"
+		elog "program xfig, you might want to recompile to take"
+		elog "advantage of the additional ps fonts."
+		elog "Also, it is possible to enable ghostscript and possibly"
+		elog "your printer to use the HP fonts."
+	fi
+}