4 files changed, 7 insertions, 93 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/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