Add a libXmu dep, drop old. Proxying for jlec.

Package-Manager: portage-2.2.0_alpha107_p2/cvs/Linux x86_64

5 files changed, 21 insertions, 98 deletions

diff --git a/x11-libs/gl2ps/ChangeLog b/x11-libs/gl2ps/ChangeLog
index f74f8443e561..d77bfed00413 100644
--- a/x11-libs/gl2ps/ChangeLog
+++ b/x11-libs/gl2ps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/gl2ps
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gl2ps/ChangeLog,v 1.20 2012/03/03 15:57:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gl2ps/ChangeLog,v 1.21 2012/05/20 17:03:21 mgorny Exp $
+
+  20 May 2012; Michał Górny <mgorny@gentoo.org> -gl2ps-1.3.5.ebuild,
+  -gl2ps-1.3.5-r2.ebuild, gl2ps-1.3.6.ebuild:
+  Add a libXmu dep, drop old. Proxying for jlec.
 
   03 Mar 2012; Brent Baude <ranger@gentoo.org> gl2ps-1.3.6.ebuild:
   Marking gl2ps-1.3.6 ppc64 for bug 398421
diff --git a/x11-libs/gl2ps/Manifest b/x11-libs/gl2ps/Manifest
index 96af95bf2842..81657284dfee 100644
--- a/x11-libs/gl2ps/Manifest
+++ b/x11-libs/gl2ps/Manifest
@@ -1,10 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gl2ps-1.3.5-CMakeLists.patch 2960 RMD160 d083be67bbe5303c20f6d3589d39f0bce35a209d SHA1 6cddec92f15dfbdd279229da23f47b8086786433 SHA256 5b27f2688d3dcb22b3d957105125482bc7a6adf08f889e9ddda175d22177eb1d
 AUX gl2ps-1.3.5-soversion.patch 582 RMD160 a849eb1deb45623243b4d4d114224e7ff07e8226 SHA1 668660ec92610e96bb750c7138de82bbb4a7802b SHA256 59048eb00994d75f7061be87775fba8c3dd1ea47e45fd821b1a2970a778c7ee9
 AUX gl2ps-1.3.6-CMakeLists.patch 2145 RMD160 3a71b7dd251932e5e85adc2c1e31325c37bb0c1d SHA1 7c463672d11667f55a807c6c22f32d6d9b5bf17b SHA256 817248b2bc3db4b1033a4adbf4493fb1e449f49ad9dd8bb0acb0975a45a1b814
-DIST gl2ps-1.3.5.tgz 212944 RMD160 bced0f28d0912670ee09c847a47e87c6787e94c3 SHA1 cf2c5220662581f48ef59173c64f41dc47011c6b SHA256 394b5af08a36f6d829a9fdde29d9938ee139245a2b1b2c815a268627e22cc4b0
 DIST gl2ps-1.3.6.tgz 294517 RMD160 a23d8958438b86ad9682de001c1793cff1af7d90 SHA1 ac36a0a82ceba0fb037b8357b01cd2383065fc2d SHA256 fd78ded7c4a323a23c3e75f160ca2800401b1771fd4183ca52d233cce892d589
-EBUILD gl2ps-1.3.5-r2.ebuild 1197 RMD160 a37998535f4f4f70fbeedf06c84e32c11c8e91b0 SHA1 84f7eaf64d7789bb745da0b82096d9719920d6da SHA256 9b7beb38648884b9e35d562d8100118342424a6fbe8e1db4a7e87b5f839bf41c
-EBUILD gl2ps-1.3.5.ebuild 1190 RMD160 47ab0bf03d67aa466761f23cfcf3f24670a15e57 SHA1 35cfe751964d15c7e9abac000bb89ee42984ea8f SHA256 0197734c41329292a736dd467fc9848a317278e1969051b8590f202c08ac1ef8
-EBUILD gl2ps-1.3.6.ebuild 1198 RMD160 92db4575d830464935b3fd91f602f1f364a1e0df SHA1 c389685d79573aa9bda4dd4d4bde49c40373f111 SHA256 72198104c83382b5b746acbe66896302eb194d2250520bb2711df69a42d41e8b
-MISC ChangeLog 2943 RMD160 67e607c6e9ee94561695f379eef5c3569a7a4f25 SHA1 8627596604b0928561e1a0fbee4d17c90313c8cb SHA256 fcb76515aacf789d20de34705b27ae623138b723f6dfedf7fd8b82c5862fd495
+EBUILD gl2ps-1.3.6.ebuild 1215 RMD160 5529aea90b09f77a198fcbdc90bafd7900b20c56 SHA1 cf41242da21514b283cc0cc388f31dc0e058f2bf SHA256 fe9ae38197f5054c52af8d2a93e1a3d4ad9c2af3edfd90d84076562c39852dc6
+MISC ChangeLog 3110 RMD160 b6aa7482589aef5d7ce68ecdefa6ca502f3e77b0 SHA1 524a5c0e12fbec430421a38d2bfa2140c6f7e143 SHA256 f31073bb5c7c970802532bcc255077b7ef20cd797d8374b9a701a4b83ecc162e
 MISC metadata.xml 625 RMD160 f91be4001dfaeb81a9894edcbde40f18e8da946a SHA1 b1d4604da52def609d106cbf6c4b9bbb60f3b7b3 SHA256 f025cb0e9be6bbd45f1eb4445c41a3f6db2fc1e4a5671117bbf061ed69f03333
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iJwEAQEIAAYFAk+5JCEACgkQfXuS5UK5QB2tKgP+PW7UmyWxUSpO9d9A5LEnVtZK
+77HV4/BBo5J/Cpu5hd1pqozjYsfIWzk9/1OjeuU0s1wcep1Ef78ej/U/t0pqxs8T
+VO2E/ntJRLGbzVHn3JflYRfP3OfFlvOYXhhKrokrFeF4+TbzW4tCspBzG66mkDUp
+U5zxINKttz4w7QURtkY=
+=Leu/
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/gl2ps/gl2ps-1.3.5-r2.ebuild b/x11-libs/gl2ps/gl2ps-1.3.5-r2.ebuild
deleted file mode 100644
index 359814b3fa25..000000000000
--- a/x11-libs/gl2ps/gl2ps-1.3.5-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gl2ps/gl2ps-1.3.5-r2.ebuild,v 1.2 2011/05/17 09:53:51 jlec Exp $
-
-EAPI=3
-inherit cmake-utils multilib
-
-DESCRIPTION="OpenGL to PostScript printing library"
-HOMEPAGE="http://www.geuz.org/gl2ps/"
-SRC_URI="http://geuz.org/${PN}/src/${P}.tgz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc png zlib"
-
-DEPEND="
-	media-libs/freeglut
-	png? ( media-libs/libpng )
-	doc? ( dev-tex/tth dev-texlive/texlive-latex )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}-source
-
-PATCHES=(
-	"${FILESDIR}"/${P}-CMakeLists.patch
-	"${FILESDIR}"/${P}-soversion.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable png PNG)
-		$(cmake-utils_use_enable zlib ZLIB)
-		$(cmake-utils_use_enable doc DOC)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib \
-			"${D%/}${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib || die
-	fi
-}
diff --git a/x11-libs/gl2ps/gl2ps-1.3.5.ebuild b/x11-libs/gl2ps/gl2ps-1.3.5.ebuild
deleted file mode 100644
index eb88b065d698..000000000000
--- a/x11-libs/gl2ps/gl2ps-1.3.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gl2ps/gl2ps-1.3.5.ebuild,v 1.8 2011/05/17 09:53:51 jlec Exp $
-
-EAPI=2
-inherit cmake-utils multilib
-
-DESCRIPTION="OpenGL to PostScript printing library"
-HOMEPAGE="http://www.geuz.org/gl2ps/"
-SRC_URI="http://geuz.org/${PN}/src/${P}.tgz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="png zlib"
-
-DEPEND="
-	media-libs/freeglut
-	png? ( media-libs/libpng )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}-source
-
-PATCHES=( "${FILESDIR}/${P}-CMakeLists.patch" )
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_has png PNG)
-		$(cmake-utils_use_has zlib ZLIB)"
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	prepalldocs
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# CMake produces an invalid dylib here, but I have no clue how to fix it
-		# hmm, it's also unversioned :(
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib \
-			"${D%/}${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib || die
-	fi
-}
diff --git a/x11-libs/gl2ps/gl2ps-1.3.6.ebuild b/x11-libs/gl2ps/gl2ps-1.3.6.ebuild
index a002b90fadb2..1e281230337f 100644
--- a/x11-libs/gl2ps/gl2ps-1.3.6.ebuild
+++ b/x11-libs/gl2ps/gl2ps-1.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gl2ps/gl2ps-1.3.6.ebuild,v 1.6 2012/03/03 15:57:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gl2ps/gl2ps-1.3.6.ebuild,v 1.7 2012/05/20 17:03:21 mgorny Exp $
 
 EAPI=4
 inherit cmake-utils multilib
@@ -16,6 +16,7 @@ IUSE="doc png zlib"
 
 DEPEND="
 	media-libs/freeglut
+	x11-libs/libXmu
 	png? ( media-libs/libpng )
 	doc? (
 		dev-tex/tth