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

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

6 files changed, 85 insertions, 28 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/Manifest b/app-office/scribus/Manifest
index d02339fe4e28..bf274d0c66b9 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -3,22 +3,22 @@ Hash: SHA512
 
 AUX scribus-1.3.5.1-system-hyphen.patch 3754 RMD160 15e0768f9f2aaf1c297b2226bd040d9ff8b0a648 SHA1 c5f9513799f41fb6569cc6bf9a2f7825d3a494bd SHA256 f17ef356e0c096b71e83048a4c97b53e455a73af7f25bc9048136c8000744e67
 AUX scribus-1.3.6-podofo-0.8.0.patch 1749 RMD160 f5a54609d7f382cc99e90857c430585f704b9918 SHA1 901631c1b1b2a01ed4acb594ad8bc1a54803810c SHA256 498e2ec592175123b54cc090b1b839c8452c1a1a768d9b29737c5386aad963b7
+AUX scribus-1.4.0_rc5-docs.patch 828 RMD160 599634de0a6f7bc2594c28f2a1d089f3818f1fd5 SHA1 e9df8b185e0bf72c19c2e1586a6a8d1ceb9bb72a SHA256 50c56976bcc2e2a7d04ee62b8c2398d91137360f69e95910c6f2a01b49c8595f
 DIST scribus-1.3.6.tar.bz2 22911379 RMD160 8f31a7e1030999fb85be9511ec97f7fc12d86a89 SHA1 35ceba09bea73b3cb10f38dddc5bc24185df794e SHA256 51399f004b3d9ae8cba48772421a307fa53cdf3bedd6a7ffb0f23909574e9675
 DIST scribus-1.3.8.tar.bz2 24942860 RMD160 6f2423062daa5dd17e6b6da9695fc81323199ac2 SHA1 be54c93a8da56d9efe5e4d46c5cebebc36104670 SHA256 4ad5f78b9e8421d621f195d185d3213e525e9c2cf1a63ebb935d13128a2126c3
 DIST scribus-1.3.9.tar.bz2 35729860 RMD160 63e1d3f7f723843e9d1c787e1405b57a15f08fcc SHA1 86bc4db2d8fbb91fe94f8535327991e9128c5862 SHA256 fb172f6b9a812f3b0a9de911b245012a067a9aad50473fa1da1d1c5861641eac
-DIST scribus-1.4.0.rc3.tar.bz2 36647793 RMD160 049cd75d4c77cdeff1470ef569a6aeae2d601761 SHA1 a426a167ffb326125ffa6937c4afb295d01e8d61 SHA256 93bd9ca73adc86895ebaf65a94b752e06ca67d959dfc25119a4dc7cf0711622f
 DIST scribus-1.4.0.rc5.tar.bz2 36661351 RMD160 73d040ef136df76fbbc440f0e8589b913919a936 SHA1 51ff4646a25656beafc494144eb94d8574fafa8d SHA256 4a65d0de346a00972447a9bed03e2a3c039023752bf5ce2fffd892a3879c2a80
 EBUILD scribus-1.3.6.ebuild 1830 RMD160 a7c2e1fe3b5df278e63c537c33f72ca92ade4db7 SHA1 15194e963496dd6624f45e68edb9f1d94811d111 SHA256 b73763a9ea03468cd87e0f28039443ba708aee3eabdaace16ba6500e59d20900
 EBUILD scribus-1.3.8.ebuild 1760 RMD160 5a7c4d967c776adba4ee4586fde4742c9db33caf SHA1 b88d52f919b39f43dad7888bf9a253252779b0b3 SHA256 2c710421fe0b3de392dfafc992768e63bea60ea668673654c7dabaf51b538dea
+EBUILD scribus-1.3.9-r1.ebuild 2010 RMD160 212550f0938bb3b4e9eab60b2c1495a43cc3ada4 SHA1 e9ca5f227deeca7ac65be0909ca6abc0e0ce5429 SHA256 9d3d6c157fe5fb011749ec1f4ea6b4182c143cc52e5b3332f453d568fa2f4209
 EBUILD scribus-1.3.9.ebuild 1758 RMD160 60e110b2ba580d460ff89aba218599f63af8d874 SHA1 6b8d45f2eac3ea5f72207aa8ce1688769f385624 SHA256 377b578f39b030b6d5fcbc8b93376cfe0ed5239e4429f236e673d821bac9bd51
-EBUILD scribus-1.4.0_rc3.ebuild 1878 RMD160 9926c3bfc41596d91b18b90656b4042c4277fde0 SHA1 5d07e4a2d3148af5419b5e25088c704e22d47c60 SHA256 59f534e74eb2276882efdf2a42154670e34d6bf3422e77bbf4bdf65bd4a7ffc2
-EBUILD scribus-1.4.0_rc5.ebuild 1878 RMD160 1daabe992b2af7899d08307223f882150fb866b4 SHA1 7834e28f8160f3cd037be7f8453be67c803f8f32 SHA256 c767f447ed8892b2627ad1c81703c469f31ccc3e52a2a3f7a36b948d0aded707
-MISC ChangeLog 17645 RMD160 7d66e78307ca3bfdaa6682609760b45a5706dbc9 SHA1 19dd3e36cff371b5690905bf496e6c350b5353df SHA256 f4f56a1c6bad6867309820b7df529f7d2b9ebb2ae049c7470f42a8cf80c9c9d4
-MISC metadata.xml 367 RMD160 a769b89b86bc5b1ba2a7e321696ceab1e6eb6219 SHA1 0cd7a4c58072eb0d5a5ce5a8185ee3cf903818a7 SHA256 04ff4a8b2c282b8280504ca317479f9188693b5bbd14301a761ffdfbe5755f3d
+EBUILD scribus-1.4.0_rc5.ebuild 2087 RMD160 5cd7681b06f0de1f164e728e6a8382fdc114dfdc SHA1 ae0577ba04e03086f8366abfc40ed5e3d151e126 SHA256 6a9ac96390e39dc323af964c9cd0fb41a14d25a9c185b6a2246d0196fafdd0c3
+MISC ChangeLog 18011 RMD160 b372cf7280924dde90fd101edb6da23a9c7fc65f SHA1 47fd98b16b8d490239b403c7baca233f9db49d28 SHA256 77d84c9ffc02baf3a8f4dd626241dac8d9e6d6ea89d8b3093d1ca917c1a4b4da
+MISC metadata.xml 509 RMD160 973444b4aa0105ba32817d53de061a7d3708a60f SHA1 0f44e6bec99702756c1128c416367cda4c1b0c0e SHA256 d20aac5deda5242c9f51e632f54f672a7c7df060ae18ff04f1779d57b202550a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk4bRkIACgkQgAnW8HDreRYuGACggz1tZAIq9ldED5ckMnUfCI5c
-RTEAnjH1H4mtRMqP/UJykc9YvsiI4y0K
-=vate
+iEYEAREKAAYFAk4cGwsACgkQgAnW8HDreRb0JwCff1EOTlAstVVevwxrfmciewto
+284AoIdGDKlB4XxEuiKS6bzy4NVokHpv
+=Ilzn
 -----END PGP SIGNATURE-----
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