media-libs/plotutils: Unbundle media-libs/libxmi, #399741

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 205 insertions, 18 deletions

diff --git a/media-libs/plotutils/ChangeLog b/media-libs/plotutils/ChangeLog
index 84a08ddd5a1e..db00b90232ce 100644
--- a/media-libs/plotutils/ChangeLog
+++ b/media-libs/plotutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/plotutils
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/ChangeLog,v 1.63 2013/05/03 17:01:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/ChangeLog,v 1.64 2013/05/04 14:21:28 jlec Exp $
+
+*plotutils-2.6-r1 (04 May 2013)
+
+  04 May 2013; Justin Lecher <jlec@gentoo.org> +plotutils-2.6-r1.ebuild,
+  +files/plotutils-2.6-libxmi.patch, metadata.xml:
+  Unbundle media-libs/libxmi, #399741
 
   03 May 2013; Andreas K. Huettel <dilfridge@gentoo.org> plotutils-2.6.ebuild:
   Fix automake-1.13 compatibility, bug 467784
diff --git a/media-libs/plotutils/Manifest b/media-libs/plotutils/Manifest
index cbaff89dde7b..1177a819b467 100644
--- a/media-libs/plotutils/Manifest
+++ b/media-libs/plotutils/Manifest
@@ -1,27 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX plotutils-2.5.1-rangecheck.patch 792 SHA256 492e98caa77ab7b7baa80d5b2a1b0a92f4042bcdf13ee73f6c9155ffb363f43a SHA512 b514a9502cd64f39c4a8b7e63761ecf4a82f1565a8f44abff60ee6f46d4b1ba1ed514c1094582521ed63b9f21ebafd4dcf18e482f030bd51b5ed7b59607cf07e WHIRLPOOL f263d0ae4605a1a1b9c2989459d3e4b481dee7789fee39b803025b2ff82cc9b59e7728c3f30ede3805d055ae1ffabd8832230db96e51efed8ccc5cbbdc00a1fb
 AUX plotutils-2.6-libpng-1.5.patch 575 SHA256 4c24410f137f2d07131ebd2d3a2b72897cd1a9e25b8cdf09696d96e3cb49d46d SHA512 bb250e520f37d1ccaa33af1267fe7b6972f709cc411ec411897d1e61a994ec4284ff3218a9abc6de9ba6345d546377e49f058f5d6cdb894b151b8f15dd7fc4e6 WHIRLPOOL 128bbc8fe5948a42401b6516933dae6919e921ff100480e464534c435e222d8dc98cf4426445c6f3d24ff9da19a8a8c4a61aed3c2f4cda5478e1ba9c82898f87
+AUX plotutils-2.6-libxmi.patch 5076 SHA256 61abfe7183c32c8810f7a24622376ddb56a4d823e30a242c1ab8bb5f29da2b0e SHA512 157824dce491a06c15091eae8129e0c2269ffecaff168485e17535d61eabfade4007fd7e799921d91d674f28b2a9f67ac957155f0661821b1363fe5045dacae1 WHIRLPOOL c2d5c404c737b41f0fc79e5a0134713554a78b9c43615cac4a88baa010b9ec26b836e85b57fb26e48fae4e9ed9fd46784aaeee0f5c542f7fdd48874abdf07802
 AUX plotutils-2.6-makefile.patch 2921 SHA256 d94474025b8f71ff28fdc65a49343defa87074383349b4679dc6e1a9315d0f4d SHA512 ac98f183d19d36c4380d0bbb25a2f86569d79136729a6c265cbc51ce4aa7ad1fc279f9ae7c0ac1db7b4e49325032bbf082db900eb740f394d890ecca57f19a84 WHIRLPOOL b599294ddab4bbed926d2d4c8675128f7d8888e41f33d5cd238b9f68cc7f42bb1df5f2a5f4838a6f9dd7e951e6b134c6c488e5f6066a869ba34c6f4049c21154
 DIST plotutils-2.6.tar.gz 3657562 SHA256 4f4222820f97ca08c7ea707e4c53e5a3556af4d8f1ab51e0da6ff1627ff433ab SHA512 4e5982605e5c1fbdb7325069c3ab2edd736e37a2eb30a1ec01fdc3541fcee6ed49937d4814c6baf79dab5b6fa42f909e4800c851d0ace3c7cf6d5a8681d0f0e7 WHIRLPOOL ef59f61ab985b300d7da8288b794b0c8f156901adfe976d159cb32cf9b167eaa6ab30a2d513cac5075575d7d80813e663681e329942d15c8d5a973ecc864516a
+EBUILD plotutils-2.6-r1.ebuild 2073 SHA256 222469d9106ea0cf13e715a78cd9588bf3cc80bf6247d9c2390dbc2f5be81a45 SHA512 2de0339a489f133ff22727c4f932c98da35f9edf330f515d52fd6f553e3f067d59e7794792f5e58bda05ee4c34c2fd1a5a275dab8a93a2d0813c8566aeeb4191 WHIRLPOOL 1a3bce3f35b5b89584ea44cd20c5638cc29e1281eee8b74f6e0827a4aebae9590670158e5c3186c563a2e9bae7afb9dac1a44d58193528393c5b16a33e76c5c4
 EBUILD plotutils-2.6.ebuild 2119 SHA256 0c23c69887c9d2c7a3a44faa0c9b7f2aaa42d285f151ac14c9e454b2ceffb9ab SHA512 6fbf110777f06fccca34eb8235fe6daccd3eba6b57439572877c037dc3f3f6962bcf51cbb9f2c34071e9e3e75e42de7bd3c2dd7dcf26e2cbd6563ac1b065ff61 WHIRLPOOL e3002c36683fda1f253720f0a9241238730424b4e50c29432d833d7acd443519cbcebaae132e986fd4bde0499034a83d4d4d4b532e8f5b7c31c6ed674d375b6a
-MISC ChangeLog 8276 SHA256 fd1cf40e2928d24192ce89f7076f7e1da381a87788a95d624e83239114d97acc SHA512 483c9db493b1b2b167e6e3af27b7c293e46d1d17c8d06ab5662fb484803aee6f07e54d7d1059bc29857101912d3a28b92b6bbcee7db48c5823b78e80d692df8e WHIRLPOOL bdfba2cc8fa6d9cafd133913a91f4f0bb9685b324ca1457c974c805fe769d0cb3ad95dfc10230f7fc641cd58391cf61ad23efcf5a084c9212629e9d5ff6b24ec
-MISC metadata.xml 161 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 SHA512 3b5d653ba492267297653f61d148b859d366b53d9c29670f175c84622f6ad64141e93e30db08e24f87a75e6fcf1ab187cc8783b72aa2ee1709cf1ef6c7c75e22 WHIRLPOOL 2516e48e62e1604c152e32a6336881cb02f3599c23856a220019bc807611880480bfe4af7a60a2bb45efbb93faf89141ccfd9fde69044677604bf976dfb65988
+MISC ChangeLog 8467 SHA256 194c9ffe66d2bac82fed5d3f67838a9136b35ea85c1bf8782103a8796df5573e SHA512 0f297cc8d12201267f577fd8d6ee8aa413ad95d4c289d9d00cd9ee4f65bd48ca930c58210da4f6cdbe175465cded80c39c24c7f712e3dc5a8c26decc0f25dbe9 WHIRLPOOL ad9083094772d2e967add0cefa92b36b2068c136c43382e8be8f79fd401d7a2507ec60fe8d5dbd64cd95e3a5eaca848eff5086332316e7c1161de27efa4a9632
+MISC metadata.xml 163 SHA256 594509291d2b412ff651880da503140d0e9a954ecf778878edabb1875682b6b8 SHA512 f030437b07f068562e24595f95b79790c2cedb00630e1364c21591bc4334acdec79d8d00ce3e8208ef60bea8685454bb8994c6c3d9f7f6c1687d2c20fbefd437 WHIRLPOOL 4c265ff911c6d2361c5d5303c3322bcabd8c87fa4f39ad36db069bfe176c34a11ecef1c01c6a3907daf724c7c79796bcb831fed06f4ee0feae145fb716e130e3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRg+4ZAAoJEJS/30SErRQv1c0QAI/THib6m8ovd7GvzN/Scxv5
-Ai6wg1hDZl0zm7jU6FG+VfZAEcSeM6cRTHOD+4dz97pSaKcDGCqjkMVpZKNsZG8T
-dcTqpVXNrH75jLuih/w1N47XiHa1mL8shR6Pl3U62YpC2kas6Ysa5FWwZ8eLVRkF
-mHDT4uSZkvTvnnIVKERzHDAdYGtdEneG7q82ZqhcXI4v9C9w9B6uEcLnMptXGqqN
-xKm6CBnyd9tPfFjks3TCwkICb419KCTJvjEKfcixE70C7wyU6ZukE9v/6PiQw/9+
-e1dITiQmpEYOeMoLGx3fsnP2a83cAwRWP486T20BRgQTFRetzQClMJ+/rI9rhhdi
-Wvbc0ilfV0aXmVhbvXkBRnSFk2/KqQk8NuBsuRePdhlt5IVLeFO5BQ8dPfVv8wHH
-00zfZZx9/1rbihV0rItMWs1j9M5NGaOn0NGwN80Yo3gbzJ7BhHrliA5fpPe4BWP8
-FPP/wdf0WC6p3KOqJgyWSpBop+3pd1ET1j3Wmn/is3Pkx0TFKBpTMdPCpCeixjlv
-3C+lkmu3l4gKyicxVux8vc2EI4pPJkxb7Q2+ZOApRZwpP18uKW+qI9nizLhn6yWz
-IKH+ns96Zi8gQEDcoTSxMOOKqkzDUvVpI/lyN9LahqiDoJijvMVToXAZeXz6sNaw
-BROYWw/ksGtDhVSIyjGz
-=Mq0q
+iEYEAREKAAYFAlGFGWwACgkQgAnW8HDreRZUuwCbBXM38gARZB6+LFSi5Reox4gK
+ccEAoMBPC+HInscJm17Zc3TD9NAOr6sb
+=1cBj
 -----END PGP SIGNATURE-----
diff --git a/media-libs/plotutils/files/plotutils-2.6-libxmi.patch b/media-libs/plotutils/files/plotutils-2.6-libxmi.patch
new file mode 100644
index 000000000000..653869fc02d8
--- /dev/null
+++ b/media-libs/plotutils/files/plotutils-2.6-libxmi.patch
@@ -0,0 +1,114 @@
+ Makefile.am            | 2 +-
+ configure.ac           | 2 +-
+ libplot/Makefile.am    | 5 +++--
+ libplot/extern.h       | 4 ++--
+ libplotter/Makefile.am | 6 ++++--
+ 5 files changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b506d17..09d3eda 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -22,7 +22,7 @@ endif
+ if NO_LIBXMI
+ ADD_LIBXMI =
+ else
+-ADD_LIBXMI = libxmi
++ADD_LIBXMI = 
+ endif
+ 
+ SUBDIRS = lib spline double ode ode-examples libplot $(ADD_LIBXMI) plot tek2plot plotfont graph hersheydemo $(ADD_LIBPLOTTER) include info doc fonts test
+diff --git a/configure.ac b/configure.ac
+index 8fb7b64..4ea0fc4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -392,5 +392,5 @@ int main()
+   fi
+ fi
+ 
+-AC_CONFIG_FILES([Makefile double/Makefile graph/Makefile hersheydemo/Makefile pic2plot/Makefile pic2plot/doc/Makefile pic2plot/libgroff/Makefile pic2plot/include/Makefile info/Makefile lib/Makefile libplot/Makefile libplotter/Makefile libxmi/Makefile libxmi/info/Makefile plot/Makefile tek2plot/Makefile tek2plot/teksamples/Makefile plotfont/Makefile spline/Makefile ode/Makefile ode-examples/Makefile include/Makefile doc/Makefile fonts/Makefile fonts/bdf/Makefile fonts/pcf/Makefile fonts/pfb/Makefile test/Makefile])
++AC_CONFIG_FILES([Makefile double/Makefile graph/Makefile hersheydemo/Makefile pic2plot/Makefile pic2plot/doc/Makefile pic2plot/libgroff/Makefile pic2plot/include/Makefile info/Makefile lib/Makefile libplot/Makefile libplotter/Makefile plot/Makefile tek2plot/Makefile tek2plot/teksamples/Makefile plotfont/Makefile spline/Makefile ode/Makefile ode-examples/Makefile include/Makefile doc/Makefile fonts/Makefile fonts/bdf/Makefile fonts/pcf/Makefile fonts/pfb/Makefile test/Makefile])
+ AC_OUTPUT
+diff --git a/libplot/Makefile.am b/libplot/Makefile.am
+index 356cbef..a0cb2ff 100644
+--- a/libplot/Makefile.am
++++ b/libplot/Makefile.am
+@@ -8,7 +8,7 @@ libplot_la_LDFLAGS = -version-info 4:4:2
+ 
+ INCLUDES = $(X_CFLAGS) -I$(srcdir)/../include -DLIBPLOT
+ 
+-MISRC = mi_alloc.c mi_api.c mi_arc.c mi_canvas.c mi_fllarc.c mi_fllrct.c \
++_MISRC = mi_alloc.c mi_api.c mi_arc.c mi_canvas.c mi_fllarc.c mi_fllrct.c \
+ mi_fplycon.c mi_gc.c mi_ply.c mi_plycon.c mi_plygen.c mi_plypnt.c	 \
+ mi_plyutil.c mi_spans.c mi_widelin.c mi_zerarc.c mi_zerolin.c mi_version.c
+ 
+@@ -87,7 +87,7 @@ x_savestate.c x_text.c y_closepl.c y_defplot.c y_erase.c y_openpl.c
+ 
+ libplot_la_SOURCES = apinewc.c apioldc.c apioldcc.c $(ALLSRC)
+ 
+-MIHEADERS = xmi.h mi_api.h mi_arc.h mi_fllarc.h mi_fply.h mi_gc.h mi_line.h \
++_MIHEADERS = xmi.h mi_api.h mi_arc.h mi_fllarc.h mi_fply.h mi_gc.h mi_line.h \
+ mi_ply.h mi_scanfill.h mi_spans.h mi_widelin.h mi_zerarc.h
+ 
+ noinst_HEADERS = extern.h g_arc.h g_colorname.h g_control.h g_cntrlify.h \
+@@ -110,6 +110,7 @@ libplot_la_LIBADD = $(X_LIBS) $(X_TOOLKIT_LIBS) $(X_PRE_LIBS) $(X_BASIC_LIBS) $(
+ endif
+ endif
+ 
++libplot_la_LIBADD += -lxmi
+ 
+ ## execute the following command in ../libxmi to produce the commands
+ ## that follow
+diff --git a/libplot/extern.h b/libplot/extern.h
+index 39a6f8c..87a05f1 100644
+--- a/libplot/extern.h
++++ b/libplot/extern.h
+@@ -1262,7 +1262,7 @@ extern void _delete_color_name_cache (plColorNameCache *color_cache);
+    and a separate version of libxmi. */
+ 
+ /* libxmi API functions */
+-
++/*
+ #define miClearPaintedSet _pl_miClearPaintedSet
+ #define miCopyCanvas _pl_miCopyCanvas
+ #define miCopyGC _pl_miCopyGC
+@@ -1291,7 +1291,7 @@ extern void _delete_color_name_cache (plColorNameCache *color_cache);
+ #define miSetGCPixels _pl_miSetGCPixels
+ #define miSetPixelMerge2 _pl_miSetPixelMerge2
+ #define miSetPixelMerge3 _pl_miSetPixelMerge3
+-
++*/
+ /* an external libxmi symbol */
+ #define mi_libxmi_ver _pl_mi_libxmi_ver
+ 
+diff --git a/libplotter/Makefile.am b/libplotter/Makefile.am
+index 9b478d6..11466ad 100644
+--- a/libplotter/Makefile.am
++++ b/libplotter/Makefile.am
+@@ -6,7 +6,7 @@ libplotter_la_LDFLAGS = -version-info 4:4:2
+ 
+ INCLUDES = $(X_CFLAGS) -I$(srcdir)/../include -DLIBPLOT -DLIBPLOTTER
+ 
+-MISRC = mi_alloc.cc mi_api.cc mi_arc.cc mi_canvas.cc mi_fllarc.cc	\
++_MISRC = mi_alloc.cc mi_api.cc mi_arc.cc mi_canvas.cc mi_fllarc.cc	\
+ mi_fllrct.cc mi_fplycon.cc mi_gc.cc mi_ply.cc mi_plycon.cc mi_plygen.cc	\
+ mi_plypnt.cc mi_plyutil.cc mi_spans.cc mi_widelin.cc mi_zerarc.cc	\
+ mi_zerolin.cc mi_version.cc
+@@ -84,7 +84,7 @@ endif
+ endif
+ 
+ 
+-MIHEADERS = xmi.h mi_api.h mi_arc.h mi_fllarc.h mi_fply.h mi_gc.h mi_line.h \
++_MIHEADERS = xmi.h mi_api.h mi_arc.h mi_fllarc.h mi_fply.h mi_gc.h mi_line.h \
+ mi_ply.h mi_scanfill.h mi_spans.h mi_widelin.h mi_zerarc.h
+ 
+ ALLHEADERS = extern.h g_arc.h g_colorname.h g_control.h g_cntrlify.h \
+@@ -111,6 +111,8 @@ libplotter_la_LIBADD = $(X_LIBS) $(X_TOOLKIT_LIBS) $(X_PRE_LIBS) $(X_BASIC_LIBS)
+ endif
+ endif
+ 
++libplotter_la_LIBADD += -lxmi
++
+ ## execute the following command in ../libplot to produce the commands
+ ## that follow
+ ## (for i in ?_*.c; do echo "$i"c: "\$(top_srcdir)/libplot/$i"; echo "	rm -f $i"c" ; if \$(LN_S) \$(top_srcdir)/libplot/$i $i"c" ; then true ; else cp -p \$(top_srcdir)/libplot/$i $i"c" ; fi"; echo; done)
diff --git a/media-libs/plotutils/metadata.xml b/media-libs/plotutils/metadata.xml
index 1fa0ca569505..447cad30a8fc 100644
--- a/media-libs/plotutils/metadata.xml
+++ b/media-libs/plotutils/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
+  <herd>printing</herd>
 </pkgmetadata>
diff --git a/media-libs/plotutils/plotutils-2.6-r1.ebuild b/media-libs/plotutils/plotutils-2.6-r1.ebuild
new file mode 100644
index 000000000000..77019fabec22
--- /dev/null
+++ b/media-libs/plotutils/plotutils-2.6-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/plotutils-2.6-r1.ebuild,v 1.1 2013/05/04 14:21:28 jlec Exp $
+
+EAPI=5
+
+inherit libtool eutils autotools
+
+DESCRIPTION="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="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+png static-libs X"
+
+DEPEND="
+	!<media-libs/plotutils-${PV}
+	media-libs/libxmi
+	png? (
+		media-libs/libpng
+		sys-libs/zlib )
+	X? (
+		x11-libs/libXaw
+		x11-proto/xextproto )"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS COMPAT ChangeLog INSTALL.* KNOWN_BUGS NEWS ONEWS PROBLEMS README THANKS TODO"
+
+src_prepare() {
+	rm -rf libxmi/* || die
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+	epatch \
+		"${FILESDIR}"/${PN}-2.5.1-rangecheck.patch \
+		"${FILESDIR}"/${P}-makefile.patch \
+		"${FILESDIR}"/${P}-libpng-1.5.patch \
+		"${FILESDIR}"/${P}-libxmi.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 \
+		--disable-libxmi \
+		$(use_enable static-libs static) \
+		$(use_with png libpng) \
+		${myconf}
+}
+
+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
+}