Version bump. Build dependencies fixed, patch updated.

Package-Manager: portage-2.2.01.21003-prefix/cvs/Linux x86_64

5 files changed, 96 insertions, 61 deletions

diff --git a/x11-libs/gl2ps/ChangeLog b/x11-libs/gl2ps/ChangeLog
index d77bfed00413..aa11a48b887e 100644
--- a/x11-libs/gl2ps/ChangeLog
+++ b/x11-libs/gl2ps/ChangeLog
@@ -1,6 +1,13 @@
 # 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.21 2012/05/20 17:03:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gl2ps/ChangeLog,v 1.22 2012/09/17 21:04:42 bicatali Exp $
+
+*gl2ps-1.3.7 (17 Sep 2012)
+
+  17 Sep 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/gl2ps-1.3.7-cmake.patch, +gl2ps-1.3.7.ebuild,
+  -files/gl2ps-1.3.5-CMakeLists.patch, -files/gl2ps-1.3.5-soversion.patch:
+  Version bump. Build dependencies fixed, patch updated.
 
   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:
@@ -86,4 +93,3 @@
   07 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org> +metadata.xml,
   +gl2ps-1.3.3.ebuild:
   Initial import
-
diff --git a/x11-libs/gl2ps/Manifest b/x11-libs/gl2ps/Manifest
index 81657284dfee..faac7f9d3c79 100644
--- a/x11-libs/gl2ps/Manifest
+++ b/x11-libs/gl2ps/Manifest
@@ -1,19 +1,18 @@
 -----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.6.tgz 294517 RMD160 a23d8958438b86ad9682de001c1793cff1af7d90 SHA1 ac36a0a82ceba0fb037b8357b01cd2383065fc2d SHA256 fd78ded7c4a323a23c3e75f160ca2800401b1771fd4183ca52d233cce892d589
-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
+AUX gl2ps-1.3.6-CMakeLists.patch 2145 SHA256 817248b2bc3db4b1033a4adbf4493fb1e449f49ad9dd8bb0acb0975a45a1b814 SHA512 48fb1639b7666aaa1bde7b37407a49c76f7ea89e91f9aad521846d0996c72b213d9056a27a339d21d799832704707ab1f68af3418e27459a1f10fa94c8f2cb7d WHIRLPOOL 74d20099c69b86abbdbf8cf6ed0e7455d096afa31862adadeca8d09545bfe5af030062b2f9354e8553dcb7d590605ee928c1491244c39019440e625c82cdd958
+AUX gl2ps-1.3.7-cmake.patch 2478 SHA256 ac164704ca2affa9f18d9d3fbe962a654fc2a4b686a0232a34ae98ae9ce495c8 SHA512 c72ce82398cbf1428a8297f9548cd21d28da1ea88cac4cfa40dd1942291bbaebd043a05eb70848c2935e1a5583ee219c9e147894cbe3732c279a33797ad62712 WHIRLPOOL be275708f7f785c1f26e33f8108a9ffad8b38122d7ea4b8ca7d0f71d300136e7e9f312fd3718f81ce0f6b1d00d314941049c6138d737bcd3e2c93f76ca67103f
+DIST gl2ps-1.3.6.tgz 294517 SHA256 fd78ded7c4a323a23c3e75f160ca2800401b1771fd4183ca52d233cce892d589
+DIST gl2ps-1.3.7.tgz 294704 SHA256 e916a35a8d35a928aa3404377b579054a5775ef1c88f0fcab4e275d6fe774ff5 SHA512 0824e4214c25f97b96f634b3e16b78bdbade42919e5a7aad09c92eae17a24b61416a25606ceaf5224c53e0d7b1190636e4f925e85eff6272381692f9ba9dcc91 WHIRLPOOL e48561330e609679ef11e1ec655c3333f7abe1a408fb8efe32a3c01b14847edfa9078ac63387e47a70381f241a629a9a84433889aaa7a8d8057dd92cf9edbbb6
+EBUILD gl2ps-1.3.6.ebuild 1215 SHA256 fe9ae38197f5054c52af8d2a93e1a3d4ad9c2af3edfd90d84076562c39852dc6 SHA512 0814c63edf194e487ad874e26e2982f3e5cd651df9e96bba6806a9929d2980e9a8433ea96883e4f2875dee7ab2134dcc9fa4ecf01b97ebbaa2ae7ca2f6c25fc2 WHIRLPOOL 9703c04b7ca2089996ec24faf09e2a9b0236460aab47fa9ba60846634672802138f1c2eccf61cff25332ff229b2271869c097c277b4fe6b98fd2e06b331ee8c8
+EBUILD gl2ps-1.3.7.ebuild 1260 SHA256 7a83ce6f980e2d436c88dbe13fa9fc97823996b6a380062dc54783d15a50891e SHA512 c0cca8c3aede2f5a17f7928d7676ea89ab84744051be042ba90ad99fca3ce77cbccb248d4b1901e4acb131705e28fb9b99cbe9b898b055e50984deaa056e6cda WHIRLPOOL fa98cde09025e82a392a94b921adf10675ba123eea1267f109e34611171ee4e73532cbe930ad0bf5dff91584da64ff3646ddc0ed7a9a861ce7e21703a99f59ac
+MISC ChangeLog 3382 SHA256 4806cacb117769b51a3a099782a1431f168488eee3ebfa924204dc6ee59f76a8 SHA512 9e52a63453eb953ff246d411e9a79d93de3ed2c3c209c3e9f6daf301716f4885d8edd24b5436908e982c7754a0967e173b84a8a0893fabf1c43bd978d478d238 WHIRLPOOL 5e18566f0ba9ef58cdaa9d923d6d28f9b8bd5abd909c65faaa7a1a5d55a0123e87ed5455d60a50268bc08a5772c579253a8bfd21b74ebe68001d0ede75c243a8
+MISC metadata.xml 625 SHA256 f025cb0e9be6bbd45f1eb4445c41a3f6db2fc1e4a5671117bbf061ed69f03333 SHA512 89f4c9960ae759945dc3408cdf39c795deb7ce524aa57d2a0f82a8a65ce125a8af71829c31a55ff56d4bd77691394b1f88a5c08e28271969cbde8d0fc648057a WHIRLPOOL eb76382316ffd81bc23f4c804b750ac8f8dfc5d386da81c468602f1f95f42429750e36cb9a4076bb290b0bc618e27faa352bff8eed3c793e740b02c8ca1d33a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk+5JCEACgkQfXuS5UK5QB2tKgP+PW7UmyWxUSpO9d9A5LEnVtZK
-77HV4/BBo5J/Cpu5hd1pqozjYsfIWzk9/1OjeuU0s1wcep1Ef78ej/U/t0pqxs8T
-VO2E/ntJRLGbzVHn3JflYRfP3OfFlvOYXhhKrokrFeF4+TbzW4tCspBzG66mkDUp
-U5zxINKttz4w7QURtkY=
-=Leu/
+iEYEAREIAAYFAlBXkHIACgkQ1ycZbhPLE2DOYQCgjq5IuPqOK46ivFiG47EKtfEg
+THIAn1YBbK//xrZ4ht2NBPdzoxRbL0PF
+=z3TN
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gl2ps/files/gl2ps-1.3.5-soversion.patch b/x11-libs/gl2ps/files/gl2ps-1.3.5-soversion.patch
deleted file mode 100644
index 6fc56fcd7b49..000000000000
--- a/x11-libs/gl2ps/files/gl2ps-1.3.5-soversion.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up gl2ps-1.3.5-source/CMakeLists.txt.r gl2ps-1.3.5-source/CMakeLists.txt
---- gl2ps-1.3.5-source/CMakeLists.txt.r	2009-10-16 21:14:07.000000000 +0200
-+++ gl2ps-1.3.5-source/CMakeLists.txt	2009-12-26 17:23:38.000000000 +0100
-@@ -116,6 +116,10 @@ if(OPENGL_FOUND)
-   install(TARGETS lib shared DESTINATION lib)
- endif(OPENGL_FOUND)
- 
-+set_target_properties(shared PROPERTIES
-+                      VERSION ${GL2PS_MAJOR_VERSION}.${GL2PS_MINOR_VERSION}.${GL2PS_PATCH_VERSION}
-+                      SOVERSION ${GL2PS_MAJOR_VERSION}) 
-+
- if(WIN32)
-   set(GL2PS_DOC .)
- else(WIN32)
diff --git a/x11-libs/gl2ps/files/gl2ps-1.3.5-CMakeLists.patch b/x11-libs/gl2ps/files/gl2ps-1.3.7-cmake.patch
index cc9a3817a72c..5382b5b3ae73 100644
--- a/x11-libs/gl2ps/files/gl2ps-1.3.5-CMakeLists.patch
+++ b/x11-libs/gl2ps/files/gl2ps-1.3.7-cmake.patch
@@ -1,36 +1,36 @@
- CMakeLists.txt |   25 ++++++++++---------------
- 1 files changed, 10 insertions(+), 15 deletions(-)
+From: Sebastien Fabbro <bicatali@gentoo.org>
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 69b88e2..e0b9278 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,6 +46,7 @@ project(gl2ps C)
+Patch to add various enhancements to cmake:
+* use GNU standard CMAKE_INSTALL_DOCDIR
+* optional documenation building
+* optional examples building
+* do not install static libraries
+
+--- CMakeLists.txt	2012-09-02 02:07:33.000000000 -0700
++++ CMakeLists.txt	2012-09-17 13:51:58.337832078 -0700
+@@ -46,6 +46,8 @@
  
  option(ENABLE_ZLIB "Enable compression using ZLIB" ON)
  option(ENABLE_PNG "Enable PNG support" ON)
 +option(ENABLE_DOC "Enable documentation" OFF)
++option(ENABLE_EXAMPLES "Build and install examples" OFF)
  
  set(GL2PS_MAJOR_VERSION 1)
  set(GL2PS_MINOR_VERSION 3)
-@@ -103,39 +104,33 @@ endif(ENABLE_PNG)
+@@ -103,8 +105,6 @@
  include_directories(${EXTERNAL_INCLUDES})
  
  if(OPENGL_FOUND)
 -  add_library(lib STATIC gl2ps.c gl2ps.h)
 -  set_target_properties(lib PROPERTIES OUTPUT_NAME gl2ps)
--
-+  #add_library(lib STATIC gl2ps.c gl2ps.h)
+ 
    add_library(shared SHARED gl2ps.c gl2ps.h)
-+  set_target_properties(shared PROPERTIES OUTPUT_NAME gl2ps)
-+
    target_link_libraries(shared ${EXTERNAL_LIBRARIES})
-   set_target_properties(shared PROPERTIES OUTPUT_NAME gl2ps)
-   if(MSVC)
+@@ -116,29 +116,32 @@
      set_target_properties(shared PROPERTIES COMPILE_FLAGS "-DGL2PSDLL -DGL2PSDLL_EXPORTS")
    endif(MSVC)
  
--  install(TARGETS lib shared DESTINATION lib)
+-  install(TARGETS lib shared DESTINATION lib${LIB_SUFFIX})
 +  install(TARGETS shared DESTINATION lib${LIB_SUFFIX})
  endif(OPENGL_FOUND)
  
@@ -38,7 +38,7 @@ index 69b88e2..e0b9278 100644
    set(GL2PS_DOC .)
  else(WIN32)
 -  set(GL2PS_DOC share/doc/gl2ps)
-+  set(GL2PS_DOC share/doc/gl2ps-${GL2PS_VERSION})
++  set(GL2PS_DOC ${CMAKE_INSTALL_DOCDIR})
  endif(WIN32)
  
  install(FILES gl2ps.h DESTINATION include)
@@ -46,30 +46,25 @@ index 69b88e2..e0b9278 100644
 -install(FILES ${CMAKE_SOURCE_DIR}/COPYING.LGPL DESTINATION ${GL2PS_DOC})
 -install(FILES ${CMAKE_SOURCE_DIR}/COPYING.GL2PS DESTINATION ${GL2PS_DOC})
 +install(FILES ${CMAKE_SOURCE_DIR}/TODO.txt DESTINATION ${GL2PS_DOC})
++
++
++if(ENABLE_EXAMPLES)
  install(FILES ${CMAKE_SOURCE_DIR}/gl2psTest.c DESTINATION ${GL2PS_DOC})
  install(FILES ${CMAKE_SOURCE_DIR}/gl2psTestSimple.c DESTINATION ${GL2PS_DOC})
-+install(FILES ${CMAKE_SOURCE_DIR}/gl2ps.pdf DESTINATION ${GL2PS_DOC})
- 
--if(GLUT_FOUND)
--  add_executable(gl2psTest WIN32 gl2psTest.c)
--  target_link_libraries(gl2psTest lib ${EXTERNAL_LIBRARIES})
--  add_executable(gl2psTestSimple WIN32 gl2psTestSimple.c)
--  target_link_libraries(gl2psTestSimple lib ${EXTERNAL_LIBRARIES})
--endif(GLUT_FOUND)
 -
+ if(GLUT_FOUND)
+   add_executable(gl2psTest WIN32 gl2psTest.c)
+   target_link_libraries(gl2psTest lib ${EXTERNAL_LIBRARIES})
+   add_executable(gl2psTestSimple WIN32 gl2psTestSimple.c)
+   target_link_libraries(gl2psTestSimple lib ${EXTERNAL_LIBRARIES})
+ endif(GLUT_FOUND)
++endif(ENABLE_EXAMPLES)
+ 
 +if(ENABLE_DOC)
  find_package(LATEX)
  if(PDFLATEX_COMPILER)
    add_custom_command(OUTPUT gl2ps.pdf DEPENDS gl2ps.tex 
-@@ -144,7 +139,6 @@ if(PDFLATEX_COMPILER)
-                      COMMAND ${PDFLATEX_COMPILER} ARGS ${CMAKE_SOURCE_DIR}/gl2ps.tex
-                      COMMAND ${CMAKE_COMMAND} -E copy gl2ps.pdf ${CMAKE_SOURCE_DIR})
-   add_custom_target(pdf ALL DEPENDS gl2ps.pdf)
--  install(FILES gl2ps.pdf DESTINATION ${GL2PS_DOC})
-   find_program(TTH tth)
-   if(TTH)
-     add_custom_command(OUTPUT gl2ps.html DEPENDS gl2ps.tex gl2ps.pdf
-@@ -154,6 +148,7 @@ if(PDFLATEX_COMPILER)
+@@ -157,6 +160,7 @@
      add_custom_target(html DEPENDS gl2ps.html)
    endif(TTH)
  endif(PDFLATEX_COMPILER)
diff --git a/x11-libs/gl2ps/gl2ps-1.3.7.ebuild b/x11-libs/gl2ps/gl2ps-1.3.7.ebuild
new file mode 100644
index 000000000000..882d227d9e8a
--- /dev/null
+++ b/x11-libs/gl2ps/gl2ps-1.3.7.ebuild
@@ -0,0 +1,49 @@
+# 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.7.ebuild,v 1.1 2012/09/17 21:04:42 bicatali Exp $
+
+EAPI=4
+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"
+
+RDEPEND="
+	media-libs/freeglut
+	x11-libs/libXmu
+	png? ( media-libs/libpng )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-tex/tth
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended )"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		$(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
+}