[gentoo-commits] gentoo-x86 commit in app-office/scribus: ChangeLog scribus-1.4.9999.ebuild

[Justin Lecher (jlec)]

jlec        12/04/30 07:45:10

  Modified:             ChangeLog scribus-1.4.9999.ebuild
  Log:
  app-office/scribus: Move changes to live version
  
  (Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

Revision  Changes    Path
1.155                app-office/scribus/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?rev=1.155&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?rev=1.155&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?r1=1.154&r2=1.155

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- ChangeLog	30 Apr 2012 07:28:44 -0000	1.154
+++ ChangeLog	30 Apr 2012 07:45:10 -0000	1.155
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/scribus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.154 2012/04/30 07:28:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.155 2012/04/30 07:45:10 jlec Exp $
+
+  30 Apr 2012; Justin Lecher <jlec@g.o> scribus-1.4.9999.ebuild:
+  Move changes to live version
 
 *scribus-1.4.0-r2 (30 Apr 2012)
 



1.2                  app-office/scribus/scribus-1.4.9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild?r1=1.1&r2=1.2

Index: scribus-1.4.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scribus-1.4.9999.ebuild	13 Feb 2012 10:55:47 -0000	1.1
+++ scribus-1.4.9999.ebuild	30 Apr 2012 07:45:10 -0000	1.2
@@ -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/app-office/scribus/scribus-1.4.9999.ebuild,v 1.1 2012/02/13 10:55:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild,v 1.2 2012/04/30 07:45:10 jlec Exp $
 
 EAPI=4
 
@@ -32,7 +32,7 @@
 	media-libs/libpng:0
 	media-libs/tiff:0
 	net-print/cups
-	sys-libs/zlib
+	sys-libs/zlib[minizip]
 	x11-libs/qt-core:4
 	x11-libs/qt-gui:4
 	virtual/jpeg
@@ -46,6 +46,7 @@
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.0_rc5-docs.patch
+	"${FILESDIR}"/${PN}-1.4.0-minizip.patch
 	)
 
 pkg_setup() {
@@ -54,6 +55,16 @@
 }
 
 src_prepare() {
+	cat > cmake/modules/FindZLIB.cmake <<- EOF
+	find_package(PkgConfig)
+	pkg_check_modules(ZLIB minizip zlib)
+	SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
+	SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
+	MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
+	EOF
+
+	rm scribus/{ioapi,unzip}.[ch] || die
+
 	if use templates; then
 		sed '/ADD_SUBDIRECTORY(resources\/templates)/d' -i CMakeLists.txt || die
 	fi
@@ -61,10 +72,6 @@
 		sed '/ADD_SUBDIRECTORY(samples)/d' -i scribus/plugins/scriptplugin/CMakeLists.txt || die
 	fi
 
-	sed \
-		-e '1i#define OF(x) x' \
-		-i scribus/fileunzip.cpp scribus/unzip.h scribus/ioapi.h || die
-
 	base_src_prepare
 	subversion_src_prepare
 }