Fixed build for doc automagic (bug #350982), remove static libraries building, added soname versioning

Package-Manager: portage-2.1.9.43/cvs/Linux x86_64

5 files changed, 92 insertions, 25 deletions

diff --git a/x11-libs/gl2ps/ChangeLog b/x11-libs/gl2ps/ChangeLog
index 3fa669ef8cfd..e52e53e3d8b3 100644
--- a/x11-libs/gl2ps/ChangeLog
+++ b/x11-libs/gl2ps/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/gl2ps
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gl2ps/ChangeLog,v 1.12 2011/02/12 17:29:53 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gl2ps/ChangeLog,v 1.13 2011/03/16 20:31:08 bicatali Exp $
+
+*gl2ps-1.3.5-r2 (16 Mar 2011)
+
+  16 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org> -gl2ps-1.3.5-r1.ebuild,
+  +gl2ps-1.3.5-r2.ebuild, files/gl2ps-1.3.5-CMakeLists.patch,
+  +files/gl2ps-1.3.5-soversion.patch:
+  Fixed build for doc automagic (bug #350982), remove static libraries
+  building, added soname versioning
 
   12 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org> -gl2ps-1.3.3.ebuild,
   gl2ps-1.3.5-r1.ebuild:
diff --git a/x11-libs/gl2ps/Manifest b/x11-libs/gl2ps/Manifest
index a13e9047fc87..bc17b9fca990 100644
--- a/x11-libs/gl2ps/Manifest
+++ b/x11-libs/gl2ps/Manifest
@@ -1,6 +1,17 @@
-AUX gl2ps-1.3.5-CMakeLists.patch 1663 RMD160 4cc7e7cbdadd182e000c6d3d70b5f118f12989df SHA1 39f57824b1d3ebd01fb3028837802d2d696ed969 SHA256 97d2c733a5cfcfb40bb9d4d6dfc319209518edbb210392d2fba73f695bd0151a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gl2ps-1.3.5-CMakeLists.patch 3034 RMD160 a937f1a43e9b599c4c4258d6ba12e4c9401bf938 SHA1 e80fec05f0e4b5ab3962f0b039daa572d8b34682 SHA256 173d63e04311ca3fc0ab922838500f8a0dd511c73e059d840003d6011ce6c4a5
+AUX gl2ps-1.3.5-soversion.patch 582 RMD160 a849eb1deb45623243b4d4d114224e7ff07e8226 SHA1 668660ec92610e96bb750c7138de82bbb4a7802b SHA256 59048eb00994d75f7061be87775fba8c3dd1ea47e45fd821b1a2970a778c7ee9
 DIST gl2ps-1.3.5.tgz 212944 RMD160 bced0f28d0912670ee09c847a47e87c6787e94c3 SHA1 cf2c5220662581f48ef59173c64f41dc47011c6b SHA256 394b5af08a36f6d829a9fdde29d9938ee139245a2b1b2c815a268627e22cc4b0
-EBUILD gl2ps-1.3.5-r1.ebuild 1272 RMD160 417018753cff5b16e643b0b1500e3f57c8d7affe SHA1 406f4a477f717b8b02babb2a4d4520d1217700fc SHA256 129708d3e32bd6b9fe536b443edb8b823cc42d80995995103aae32ffaeaa6c0f
+EBUILD gl2ps-1.3.5-r2.ebuild 1181 RMD160 428d4c3a8923bdfc793f7165e85e2b88d5996d60 SHA1 ca4e496ac653d300ae513521d8ae21cc4da80b01 SHA256 0c38110d86b6efe00e44cadffff58602e7263987519c24675bbb2d82aaefadc4
 EBUILD gl2ps-1.3.5.ebuild 1173 RMD160 08a282ba4e098a095aaa6214bf78dd00dcc64079 SHA1 eab6beaa8b375d4fa9284455b9b47ff3205b4e1d SHA256 47460137ff24c3019dd66ab7bad34b7c7657a45f5b9a8da2ad4055c37f039676
-MISC ChangeLog 1731 RMD160 b57c19829c11fddb89873bb13bbe8f1e14cd6e8d SHA1 9a97e0b408adde89ec9af90799ec4f943dd18e24 SHA256 ff9476a13c740c4d719bad51cccdadd515f3b999119896ac62a3bf2ca2d71f83
+MISC ChangeLog 2047 RMD160 2fd6aecdc5bdd7be006616db7f7683d916ebfa80 SHA1 37150d37d2203a054dd64b6dac039e134912c7ba SHA256 f2cc7e0572a8d8e165b36e5fc8b867812bfb1903f97b30dddb6e76d43ffe1ca1
 MISC metadata.xml 623 RMD160 3009127c2064b068ec7ac0e024dea6e3f415126e SHA1 ebdc623441bec64dbefcc590c56069d5c4de5643 SHA256 48657d240db2cb13495a31f2b7c7b598143c30d3b6c8bcbf17f4086a324de1f5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2BHhgACgkQ1ycZbhPLE2B6bgCePUt0y/YHTV/UIrGznTKy4pyz
+JCEAnjipAofrhmV54cAfjyZpsafWCjqb
+=9qTx
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/gl2ps/files/gl2ps-1.3.5-CMakeLists.patch b/x11-libs/gl2ps/files/gl2ps-1.3.5-CMakeLists.patch
index 3da24a5d1ae3..87e3b7f58172 100644
--- a/x11-libs/gl2ps/files/gl2ps-1.3.5-CMakeLists.patch
+++ b/x11-libs/gl2ps/files/gl2ps-1.3.5-CMakeLists.patch
@@ -1,12 +1,33 @@
-diff -ur gl2ps-1.3.5-source.orig/CMakeLists.txt gl2ps-1.3.5-source/CMakeLists.txt
---- gl2ps-1.3.5-source.orig/CMakeLists.txt	2009-10-16 22:14:07.000000000 +0300
-+++ gl2ps-1.3.5-source/CMakeLists.txt	2010-01-01 12:01:00.000000000 +0200
-@@ -113,21 +113,21 @@
+diff -Nur gl2ps-1.3.5-source.orig/CMakeLists.txt gl2ps-1.3.5-source/CMakeLists.txt
+--- gl2ps-1.3.5-source.orig/CMakeLists.txt	2011-03-16 19:21:58.000000000 +0000
++++ gl2ps-1.3.5-source/CMakeLists.txt	2011-03-16 19:29:50.000000000 +0000
+@@ -46,6 +46,7 @@
+ 
+ option(ENABLE_ZLIB "Enable compression using ZLIB" ON)
+ option(ENABLE_PNG "Enable PNG support" ON)
++option(ENABLE_DOC "Enable documentation" OFF)
+ 
+ set(GL2PS_MAJOR_VERSION 1)
+ set(GL2PS_MINOR_VERSION 3)
+@@ -103,39 +104,40 @@
+ 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)
      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)
  
  if(WIN32)
@@ -27,7 +48,18 @@ diff -ur gl2ps-1.3.5-source.orig/CMakeLists.txt gl2ps-1.3.5-source/CMakeLists.tx
  
  if(GLUT_FOUND)
    add_executable(gl2psTest WIN32 gl2psTest.c)
-@@ -144,7 +144,6 @@
+-  target_link_libraries(gl2psTest lib ${EXTERNAL_LIBRARIES})
++  target_link_libraries(gl2psTest shared ${EXTERNAL_LIBRARIES})
+   add_executable(gl2psTestSimple WIN32 gl2psTestSimple.c)
+-  target_link_libraries(gl2psTestSimple lib ${EXTERNAL_LIBRARIES})
++  target_link_libraries(gl2psTestSimple shared ${EXTERNAL_LIBRARIES})
+ endif(GLUT_FOUND)
+ 
++if(ENABLE_DOC)
+ find_package(LATEX)
+ if(PDFLATEX_COMPILER)
+   add_custom_command(OUTPUT gl2ps.pdf DEPENDS gl2ps.tex 
+@@ -144,7 +146,6 @@
                       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)
@@ -35,3 +67,11 @@ diff -ur gl2ps-1.3.5-source.orig/CMakeLists.txt gl2ps-1.3.5-source/CMakeLists.tx
    find_program(TTH tth)
    if(TTH)
      add_custom_command(OUTPUT gl2ps.html DEPENDS gl2ps.tex gl2ps.pdf
+@@ -154,6 +155,7 @@
+     add_custom_target(html DEPENDS gl2ps.html)
+   endif(TTH)
+ endif(PDFLATEX_COMPILER)
++endif(ENABLE_DOC)
+ 
+ set(CPACK_PACKAGE_VENDOR "Christophe Geuzaine")
+ set(CPACK_PACKAGE_VERSION_MAJOR ${GL2PS_MAJOR_VERSION})
diff --git a/x11-libs/gl2ps/files/gl2ps-1.3.5-soversion.patch b/x11-libs/gl2ps/files/gl2ps-1.3.5-soversion.patch
new file mode 100644
index 000000000000..6fc56fcd7b49
--- /dev/null
+++ b/x11-libs/gl2ps/files/gl2ps-1.3.5-soversion.patch
@@ -0,0 +1,14 @@
+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/gl2ps-1.3.5-r1.ebuild b/x11-libs/gl2ps/gl2ps-1.3.5-r2.ebuild
index 29dfae0d3305..7bba4a2041e5 100644
--- a/x11-libs/gl2ps/gl2ps-1.3.5-r1.ebuild
+++ b/x11-libs/gl2ps/gl2ps-1.3.5-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.5 2011/02/12 17:29:53 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gl2ps/gl2ps-1.3.5-r2.ebuild,v 1.1 2011/03/16 20:31:08 bicatali Exp $
 
 EAPI="3"
 inherit cmake-utils multilib
@@ -17,30 +17,24 @@ IUSE="doc png zlib"
 DEPEND="media-libs/freeglut
 	png? ( media-libs/libpng )
 	zlib? ( sys-libs/zlib )
-	doc? (
-		dev-tex/tth
-		dev-texlive/texlive-latex
-		)"
+	doc? ( dev-tex/tth dev-texlive/texlive-latex )"
 
-S=${WORKDIR}/${P}-source
+S="${WORKDIR}/${P}-source"
 
-PATCHES=( "${FILESDIR}/${P}-CMakeLists.patch" )
+PATCHES=( "${FILESDIR}"/${P}-CMakeLists.patch "${FILESDIR}"/${P}-soversion.patch )
 
 src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_has png PNG)
-		$(cmake-utils_use_has zlib ZLIB)
-		$(cmake-utils_use_has doc DOC)"
+	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
-	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