aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-libs/gl2ps/ChangeLog5
-rw-r--r--x11-libs/gl2ps/Manifest13
-rw-r--r--x11-libs/gl2ps/files/1.3.5-CMakeLists.patch38
-rw-r--r--x11-libs/gl2ps/gl2ps-1.3.5.ebuild49
4 files changed, 78 insertions, 27 deletions
diff --git a/x11-libs/gl2ps/ChangeLog b/x11-libs/gl2ps/ChangeLog
index 130e12201..a0d83d9bb 100644
--- a/x11-libs/gl2ps/ChangeLog
+++ b/x11-libs/gl2ps/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/gl2ps/ChangeLog,v 1.1 2009/04/07 18:41:50 bicatali Exp $
+ 21 Nov 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+ +files/1.3.5-CMakeLists.patch, gl2ps-1.3.5.ebuild:
+ Version bump
+ ported to cmake buildsystem
+
*gl2ps-1.3.3 (07 Apr 2009)
07 Apr 2009; S├ębastien Fabbro <bicatali@gentoo.org> +metadata.xml,
diff --git a/x11-libs/gl2ps/Manifest b/x11-libs/gl2ps/Manifest
index e4fc3b4e6..6c0c39ca3 100644
--- a/x11-libs/gl2ps/Manifest
+++ b/x11-libs/gl2ps/Manifest
@@ -1,14 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-DIST gl2ps-1.3.3.tgz 197929 RMD160 cebce2bba693541fcb8cedbf083bc85786884e0d SHA1 ec952fd3d7205bdbffe7854be607213c7dcb4aaf SHA256 d4913141508b070aa261b93bb0785627f4956a3d63c4f8418f60267d9fe7ba09
-EBUILD gl2ps-1.3.3.ebuild 1003 RMD160 dd4c47033b8f7504ae498f57503e397a92e785ab SHA1 f5155464624938a0648ed8698bef9690deb5e88b SHA256 97c2f28669367cef80f2c2ce932868f3050dec8344012d0a06b4ae3e8db3d998
-MISC ChangeLog 342 RMD160 be87108d46e79b2db994935cfc5411ae4083a762 SHA1 3dbc3728b3de119545a4e44b64397be201812d16 SHA256 bbf9b4fa368e4d541c2dbebe2d180793457d2185a490e36243f8c85193c1a476
+AUX 1.3.5-CMakeLists.patch 1577 RMD160 3616b38e186177cc7806fcadb9812e486312f560 SHA1 c2d2dea994023aed5659e3aa09719a69bfafd550 SHA256 8c3eabc6915173ad048f40f2ba5998ba78ed3f3d4974f7bca0f7332f7f7ff287
+DIST gl2ps-1.3.5.tgz 212944 RMD160 bced0f28d0912670ee09c847a47e87c6787e94c3 SHA1 cf2c5220662581f48ef59173c64f41dc47011c6b SHA256 394b5af08a36f6d829a9fdde29d9938ee139245a2b1b2c815a268627e22cc4b0
+EBUILD gl2ps-1.3.5.ebuild 840 RMD160 13b194334e3f90596aed2115ca398f20afd742ff SHA1 6e8c783262f4b73bee37ce92fd2f0f6d40e9e9fe SHA256 b4b67b035cf6a7753fc00b7d3c61a7927a865d651e8271b5b4abdd707915acb9
+MISC ChangeLog 498 RMD160 4deb6d34b6b947451568391bfebbd4167b65a078 SHA1 e90ee9d297c1cdcc77981e4aa1306ede1268b68a SHA256 a7f6845c14862e4d28f8faaf1a63dcb75bcc2f02e9d7d77936b2f73a58a71c9c
MISC metadata.xml 623 RMD160 3009127c2064b068ec7ac0e024dea6e3f415126e SHA1 ebdc623441bec64dbefcc590c56069d5c4de5643 SHA256 48657d240db2cb13495a31f2b7c7b598143c30d3b6c8bcbf17f4086a324de1f5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAknbnpkACgkQ1ycZbhPLE2AGyACfcCwQZMbeLjKuosIueoX1P2mu
-AYMAn2W9LMoLhqNnoMrTyaNd8E1YCuKd
-=h6Uv
+iEYEARECAAYFAksILqAACgkQgAnW8HDreRaMlwCfQ5KlMLU9DQH6ojn1jou1yOta
++x4AoKIHd1UNurMoKwtZnVonmSQUOxNN
+=FQp3
-----END PGP SIGNATURE-----
diff --git a/x11-libs/gl2ps/files/1.3.5-CMakeLists.patch b/x11-libs/gl2ps/files/1.3.5-CMakeLists.patch
new file mode 100644
index 000000000..16565c927
--- /dev/null
+++ b/x11-libs/gl2ps/files/1.3.5-CMakeLists.patch
@@ -0,0 +1,38 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 69b88e2..9cfa8ae 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -113,21 +113,21 @@ if(OPENGL_FOUND)
+ set_target_properties(shared PROPERTIES COMPILE_FLAGS "-DGL2PSDLL -DGL2PSDLL_EXPORTS")
+ endif(MSVC)
+
+- install(TARGETS lib shared DESTINATION lib)
++ install(TARGETS lib shared DESTINATION GENTOOLIB)
+ endif(OPENGL_FOUND)
+
+ if(WIN32)
+ set(GL2PS_DOC .)
+ else(WIN32)
+- set(GL2PS_DOC share/doc/gl2ps)
++ set(GL2PS_DOC share/doc/gl2ps-${GL2PS_VERSION})
+ endif(WIN32)
+
+ install(FILES gl2ps.h DESTINATION include)
+ install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION ${GL2PS_DOC})
+-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})
+ 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)
+@@ -144,7 +144,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
diff --git a/x11-libs/gl2ps/gl2ps-1.3.5.ebuild b/x11-libs/gl2ps/gl2ps-1.3.5.ebuild
index 7e0e71a62..46ec0b13f 100644
--- a/x11-libs/gl2ps/gl2ps-1.3.5.ebuild
+++ b/x11-libs/gl2ps/gl2ps-1.3.5.ebuild
@@ -1,37 +1,44 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gl2ps/gl2ps-1.3.3.ebuild,v 1.1 2009/04/07 18:41:50 bicatali Exp $
+# $Header: $
-EAPI=2
-inherit eutils toolchain-funcs
+EAPI="2"
+
+inherit cmake-utils eutils
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"
-IUSE="doc"
+IUSE="+png +zlib"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-RDEPEND="virtual/glut"
+RDEPEND="
+ virtual/glut
+ png? ( media-libs/libpng )
+ zlib? ( sys-libs/zlib )"
DEPEND="${RDEPEND}"
-src_compile() {
- $(tc-getCC) ${CFLAGS} -fPIC -c gl2ps.c -o gl2ps.o \
- || die "compiling gl2ps failed"
- $(tc-getCC) -shared ${LDFLAGS} -Wl,-soname,libgl2ps.so.1 \
- gl2ps.o -o libgl2ps.so.1 -lm -lGL -lGLU -lglut \
- || die "linking libgl2ps failed"
+S="${WORKDIR}"/${P}-source
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PV}-CMakeLists.patch
+
+ sed \
+ -e "s:GENTOOLIB:$(get_libdir):g" \
+ -i CMakeLists.txt
+}
+
+src_configure() {
+ mycmakeargs="${mycmakeargs}
+ $(cmake-utils_use_has png PNG)
+ $(cmake-utils_use_has zlib ZLIB)"
+
+ cmake-utils_src_configure
}
-src_install () {
- dolib.so libgl2ps.so.1 || die
- dosym libgl2ps.so.1 /usr/$(get_libdir)/libgl2ps.so
- insinto /usr/include
- doins gl2ps.h || die
- dodoc TODO
- insinto /usr/share/doc/${PF}
- if use doc; then
- doins gl2psTest* *.pdf || die
- fi
+src_install() {
+ cmake-utils_src_install
+ prepalldocs || die
}