Fixed underlinking, #367649

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

5 files changed, 44 insertions, 32 deletions

diff --git a/x11-libs/gl2ps/ChangeLog b/x11-libs/gl2ps/ChangeLog
index e52e53e3d8b3..eff9f7bf0f36 100644
--- a/x11-libs/gl2ps/ChangeLog
+++ b/x11-libs/gl2ps/ChangeLog
@@ -1,6 +1,10 @@
 # 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.13 2011/03/16 20:31:08 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gl2ps/ChangeLog,v 1.14 2011/05/17 09:53:51 jlec Exp $
+
+  17 May 2011; Justin Lecher <jlec@gentoo.org> gl2ps-1.3.5.ebuild,
+  gl2ps-1.3.5-r2.ebuild, files/gl2ps-1.3.5-CMakeLists.patch:
+  Fixed underlinking, #367649
 
 *gl2ps-1.3.5-r2 (16 Mar 2011)
 
diff --git a/x11-libs/gl2ps/Manifest b/x11-libs/gl2ps/Manifest
index bc17b9fca990..ce1b1183d91f 100644
--- a/x11-libs/gl2ps/Manifest
+++ b/x11-libs/gl2ps/Manifest
@@ -1,17 +1,17 @@
 -----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-CMakeLists.patch 2960 RMD160 d083be67bbe5303c20f6d3589d39f0bce35a209d SHA1 6cddec92f15dfbdd279229da23f47b8086786433 SHA256 5b27f2688d3dcb22b3d957105125482bc7a6adf08f889e9ddda175d22177eb1d
 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-r2.ebuild 1181 RMD160 428d4c3a8923bdfc793f7165e85e2b88d5996d60 SHA1 ca4e496ac653d300ae513521d8ae21cc4da80b01 SHA256 0c38110d86b6efe00e44cadffff58602e7263987519c24675bbb2d82aaefadc4
-EBUILD gl2ps-1.3.5.ebuild 1173 RMD160 08a282ba4e098a095aaa6214bf78dd00dcc64079 SHA1 eab6beaa8b375d4fa9284455b9b47ff3205b4e1d SHA256 47460137ff24c3019dd66ab7bad34b7c7657a45f5b9a8da2ad4055c37f039676
-MISC ChangeLog 2047 RMD160 2fd6aecdc5bdd7be006616db7f7683d916ebfa80 SHA1 37150d37d2203a054dd64b6dac039e134912c7ba SHA256 f2cc7e0572a8d8e165b36e5fc8b867812bfb1903f97b30dddb6e76d43ffe1ca1
+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
+MISC ChangeLog 2202 RMD160 935738f128583143de2923201e06b451364f664a SHA1 92abb7bc0ae98ab68fe0f7dbfeaf39a8669bb342 SHA256 ae577c1a64ddd2f84e390677e34897ae9aff7965128e57deb1f29c4b5f2c5e7e
 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
+iEYEARECAAYFAk3SRbQACgkQgAnW8HDreRb5IwCeMbP+440SMvrRGqiJsa27yQBA
+Y6MAniEWCpMB8fl1dR/XMIfjpTl6bWFw
+=SMsQ
 -----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 87e3b7f58172..cc9a3817a72c 100644
--- a/x11-libs/gl2ps/files/gl2ps-1.3.5-CMakeLists.patch
+++ b/x11-libs/gl2ps/files/gl2ps-1.3.5-CMakeLists.patch
@@ -1,7 +1,11 @@
-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 @@
+ CMakeLists.txt |   25 ++++++++++---------------
+ 1 files changed, 10 insertions(+), 15 deletions(-)
+
+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)
  
  option(ENABLE_ZLIB "Enable compression using ZLIB" ON)
  option(ENABLE_PNG "Enable PNG support" ON)
@@ -9,7 +13,7 @@ diff -Nur gl2ps-1.3.5-source.orig/CMakeLists.txt gl2ps-1.3.5-source/CMakeLists.t
  
  set(GL2PS_MAJOR_VERSION 1)
  set(GL2PS_MINOR_VERSION 3)
-@@ -103,39 +104,40 @@
+@@ -103,39 +104,33 @@ endif(ENABLE_PNG)
  include_directories(${EXTERNAL_INCLUDES})
  
  if(OPENGL_FOUND)
@@ -46,20 +50,18 @@ diff -Nur gl2ps-1.3.5-source.orig/CMakeLists.txt gl2ps-1.3.5-source/CMakeLists.t
  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)
+-if(GLUT_FOUND)
+-  add_executable(gl2psTest WIN32 gl2psTest.c)
 -  target_link_libraries(gl2psTest lib ${EXTERNAL_LIBRARIES})
-+  target_link_libraries(gl2psTest shared ${EXTERNAL_LIBRARIES})
-   add_executable(gl2psTestSimple WIN32 gl2psTestSimple.c)
+-  add_executable(gl2psTestSimple WIN32 gl2psTestSimple.c)
 -  target_link_libraries(gl2psTestSimple lib ${EXTERNAL_LIBRARIES})
-+  target_link_libraries(gl2psTestSimple shared ${EXTERNAL_LIBRARIES})
- endif(GLUT_FOUND)
- 
+-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 @@
+@@ -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)
@@ -67,7 +69,7 @@ diff -Nur gl2ps-1.3.5-source.orig/CMakeLists.txt gl2ps-1.3.5-source/CMakeLists.t
    find_program(TTH tth)
    if(TTH)
      add_custom_command(OUTPUT gl2ps.html DEPENDS gl2ps.tex gl2ps.pdf
-@@ -154,6 +155,7 @@
+@@ -154,6 +148,7 @@ if(PDFLATEX_COMPILER)
      add_custom_target(html DEPENDS gl2ps.html)
    endif(TTH)
  endif(PDFLATEX_COMPILER)
diff --git a/x11-libs/gl2ps/gl2ps-1.3.5-r2.ebuild b/x11-libs/gl2ps/gl2ps-1.3.5-r2.ebuild
index 7bba4a2041e5..359814b3fa25 100644
--- a/x11-libs/gl2ps/gl2ps-1.3.5-r2.ebuild
+++ b/x11-libs/gl2ps/gl2ps-1.3.5-r2.ebuild
@@ -1,8 +1,8 @@
 # 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.1 2011/03/16 20:31:08 bicatali Exp $
+# $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"
+EAPI=3
 inherit cmake-utils multilib
 
 DESCRIPTION="OpenGL to PostScript printing library"
@@ -14,14 +14,18 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc png zlib"
 
-DEPEND="media-libs/freeglut
+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 )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${P}-source"
+S=${WORKDIR}/${P}-source
 
-PATCHES=( "${FILESDIR}"/${P}-CMakeLists.patch "${FILESDIR}"/${P}-soversion.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-CMakeLists.patch
+	"${FILESDIR}"/${P}-soversion.patch )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/x11-libs/gl2ps/gl2ps-1.3.5.ebuild b/x11-libs/gl2ps/gl2ps-1.3.5.ebuild
index 56cd158ef10e..eb88b065d698 100644
--- a/x11-libs/gl2ps/gl2ps-1.3.5.ebuild
+++ b/x11-libs/gl2ps/gl2ps-1.3.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.7 2010/09/16 17:33:01 scarabeus Exp $
+# $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
@@ -14,9 +14,11 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="png zlib"
 
-DEPEND="media-libs/freeglut
+DEPEND="
+	media-libs/freeglut
 	png? ( media-libs/libpng )
 	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${P}-source