Add myself as maintainer, added USE=example templates to slim the installation, sane doc installation fix for 1.4 (Help brwoser was not working)

(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)

5 files changed, 77 insertions, 20 deletions

diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index d55dd2927b95..83e07a33962a 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-office/scribus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.143 2011/07/11 18:51:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.144 2011/07/12 09:59:33 jlec Exp $
+
+*scribus-1.3.9-r1 (12 Jul 2011)
+
+  12 Jul 2011; Justin Lecher <jlec@gentoo.org> +scribus-1.3.9-r1.ebuild,
+  -scribus-1.4.0_rc3.ebuild, scribus-1.4.0_rc5.ebuild,
+  +files/scribus-1.4.0_rc5-docs.patch, metadata.xml:
+  Add myself as maintainer, added USE=example templates to slim the
+  installation, sane doc installation fix for 1.4 (Help brwoser was not
+  working)
 
   11 Jul 2011; Justin Lecher <jlec@gentoo.org> scribus-1.3.6.ebuild,
   scribus-1.3.8.ebuild, scribus-1.3.9.ebuild, scribus-1.4.0_rc3.ebuild,
diff --git a/app-office/scribus/files/scribus-1.4.0_rc5-docs.patch b/app-office/scribus/files/scribus-1.4.0_rc5-docs.patch
new file mode 100644
index 000000000000..c6e49e68d7a3
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.4.0_rc5-docs.patch
@@ -0,0 +1,29 @@
+ CMakeLists.txt |    4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3f34048..4880594 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -267,7 +267,7 @@ ELSE (WIN32 OR OS2)
+     SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
+   ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
+         IF(NOT WANT_VERSIONING)
+-            SET(DOCDIR "share/doc/${MAIN_DIR_NAME}/")
++            SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${GENTOOVERSION}/")
+         ELSE(NOT WANT_VERSIONING)
+             SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/")
+         ENDIF(NOT WANT_VERSIONING)
+@@ -801,12 +801,10 @@ INSTALL(FILES
+   BUILDING
+   ChangeLog
+   ChangeLogSVN
+-  COPYING
+   LINKS
+   NEWS
+   PACKAGING
+   README
+-  README.MacOSX
+   TODO
+   TRANSLATION
+   DESTINATION ${DOCDIR}
diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml
index 6b58f9a40e44..c8954cc93984 100644
--- a/app-office/scribus/metadata.xml
+++ b/app-office/scribus/metadata.xml
@@ -6,7 +6,12 @@
 		<email>hanno@gentoo.org</email>
 		<name>Hanno Boeck</name>
 	</maintainer>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+		<name>Justin Lecher</name>
+	</maintainer>
 	<use>
 		<flag name="minimal">Don't install headers (only required for e.g. plug-in developers)</flag>
+		<flag name="templates">Document tamplates</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-office/scribus/scribus-1.4.0_rc3.ebuild b/app-office/scribus/scribus-1.3.9-r1.ebuild
index 6d976137dd30..4d7ccd8ef99f 100644
--- a/app-office/scribus/scribus-1.4.0_rc3.ebuild
+++ b/app-office/scribus/scribus-1.3.9-r1.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/app-office/scribus/scribus-1.4.0_rc3.ebuild,v 1.2 2011/07/11 18:51:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.9-r1.ebuild,v 1.1 2011/07/12 09:59:33 jlec Exp $
 
 EAPI=2
 
@@ -8,16 +8,14 @@ PYTHON_DEPEND="2:2.6"
 
 inherit cmake-utils fdo-mime multilib python
 
-MY_P="${P/_/.}"
-
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="http://www.scribus.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cairo debug +minimal +pdf spell"
+IUSE="cairo debug examples +minimal +pdf spell templates"
 
 COMMON_DEPEND="
 	dev-libs/hyphen
@@ -40,14 +38,24 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost"
 
-DOCS="AUTHORS ChangeLog* LINKS NEWS README TODO TRANSLATION"
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.5.1-system-hyphen.patch"
+	)
 
-S=${WORKDIR}/${MY_P}
+DOCS="AUTHORS ChangeLog* LINKS NEWS README TODO TRANSLATION"
 
 pkg_setup() {
 	python_set_active_version 2
 }
 
+src_prepare() {
+	use templates || \
+		sed '/ADD_SUBDIRECTORY(resources\/templates)/d' -i CMakeLists.txt
+	use examples || \
+		sed '/ADD_SUBDIRECTORY(samples)/d' -i scribus/plugins/scriptplugin/CMakeLists.txt
+	base_src_prepare
+}
+
 src_configure() {
 	mycmakeargs=(
 		"-DHAVE_PYTHON=ON"
@@ -68,10 +76,6 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	# Use one directory for documentation
-	mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${PF}/
-	rmdir "${D}"/usr/share/doc/${PN}
-
 	doicon resources/icons/scribus.png
 	domenu scribus.desktop
 }
diff --git a/app-office/scribus/scribus-1.4.0_rc5.ebuild b/app-office/scribus/scribus-1.4.0_rc5.ebuild
index 356647ec9349..b11e074bdb50 100644
--- a/app-office/scribus/scribus-1.4.0_rc5.ebuild
+++ b/app-office/scribus/scribus-1.4.0_rc5.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/app-office/scribus/scribus-1.4.0_rc5.ebuild,v 1.2 2011/07/11 18:51:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.0_rc5.ebuild,v 1.3 2011/07/12 09:59:33 jlec Exp $
 
-EAPI=2
+EAPI=3
 
 PYTHON_DEPEND="2:2.6"
 
@@ -17,14 +17,14 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cairo debug +minimal +pdf spell"
+IUSE="cairo debug examples +minimal +pdf spell templates"
 
 COMMON_DEPEND="
 	dev-libs/hyphen
 	dev-libs/libxml2
 	media-libs/fontconfig
 	media-libs/freetype:2
-	media-libs/lcms:0
+	media-libs/lcms:2
 	media-libs/libpng
 	media-libs/tiff
 	net-print/cups
@@ -40,7 +40,9 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost"
 
-DOCS="AUTHORS ChangeLog* LINKS NEWS README TODO TRANSLATION"
+PATCHES=(
+	"${FILESDIR}"/${P}-docs.patch
+	)
 
 S=${WORKDIR}/${MY_P}
 
@@ -48,6 +50,14 @@ pkg_setup() {
 	python_set_active_version 2
 }
 
+src_prepare() {
+	use templates || \
+		sed '/ADD_SUBDIRECTORY(resources\/templates)/d' -i CMakeLists.txt
+	use examples || \
+		sed '/ADD_SUBDIRECTORY(samples)/d' -i scribus/plugins/scriptplugin/CMakeLists.txt
+	base_src_prepare
+}
+
 src_configure() {
 	mycmakeargs=(
 		"-DHAVE_PYTHON=ON"
@@ -56,6 +66,7 @@ src_configure() {
 		"-DWANT_NORPATH=ON"
 		"-DWANT_QTARTHUR=ON"
 		"-DWANT_QT3SUPPORT=OFF"
+		"-DGENTOOVERSION=${PVR}"
 		$(cmake-utils_use_has spell ASPELL)
 		$(cmake-utils_use_has pdf PODOFO)
 		$(cmake-utils_use_want cairo)
@@ -68,9 +79,8 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	# Use one directory for documentation
-	mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${PF}/
-	rmdir "${D}"/usr/share/doc/${PN}
+	mv "${ED}"/usr/share/doc/${PF}/{en,html}
+	ln -sf html "${ED}"/usr/share/doc/${PF}/en
 
 	doicon resources/icons/scribus.png
 	domenu scribus.desktop