Adjust all ebuilds to each other

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

8 files changed, 57 insertions, 45 deletions

diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index ce1a1dc40964..d55dd2927b95 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,11 @@
 # 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.142 2011/06/22 22:11:32 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.143 2011/07/11 18:51:40 jlec Exp $
+
+  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,
+  scribus-1.4.0_rc5.ebuild, metadata.xml:
+  Adjust all ebuilds to each other
 
 *scribus-1.4.0_rc5 (22 Jun 2011)
 
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index ed4fe5b7b9d4..d02339fe4e28 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+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
@@ -8,21 +8,17 @@ DIST scribus-1.3.8.tar.bz2 24942860 RMD160 6f2423062daa5dd17e6b6da9695fc81323199
 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 1815 RMD160 378b222e3a7f4ed78db9b805931764911c08f984 SHA1 b5c740e9d2e58dc9e54e477540f46661006bee66 SHA256 0ada84c03b6f88446b3896a98cefcb2b8faad5ffbd414f0a4a37ef50466e5b78
-EBUILD scribus-1.3.8.ebuild 1747 RMD160 46f8dcbe7b3bc7cbf050cf1bc9c986d22b4935f8 SHA1 c931eaa4565ce39bc30f152df3b9e52c3784ea72 SHA256 cc9a12c6d53f7ec5e5f0ea12d46399dbd1c47544538170e1b4c0bb4caa1883fb
-EBUILD scribus-1.3.9.ebuild 1742 RMD160 911fbc94dd35ea9576bf73b010951c090613f0ce SHA1 53472a7a3ca33968168ae2a6258bf6d71492919d SHA256 9fbe6a7981c8c968dea75c92aa7b89a11f92f264c503f0f8070649970780bf83
-EBUILD scribus-1.4.0_rc3.ebuild 1881 RMD160 66de55ee9ff82998183f9f69af2e255a7249c832 SHA1 5ee39862fc572f405b684dac23b2a26ee845920c SHA256 8740861597d9d4e3bcd0a6b6261acea441549b2d9c12a5ec33c9a7fcffc6f55a
-EBUILD scribus-1.4.0_rc5.ebuild 1881 RMD160 2604cd796e6361911a6a259b2e7ac9ddf7f64aa1 SHA1 cbd639ce2d8bf570eaa3307ebd2316e30bc89469 SHA256 c41a2702a87e07be7edfce6823b22481b725d09c7bc8f9ed705b178108fd8d5c
-MISC ChangeLog 17431 RMD160 d0eadc513c4476c745895c4723334945c41dd80a SHA1 d3bf6c6920e5516e77ec5ba2060d298905ee9813 SHA256 8cca8209defbd31cb691cf4cf22212d494c62e8c9c92d99725d0dc628d40cfa5
-MISC metadata.xml 378 RMD160 2fa6ab13de3a197730f0888b1c468e532784c714 SHA1 551e7f0bc554518120b6c6b1bc097f5fb5d1eb49 SHA256 0a54cc08b3a8542bc6d63f6670ee998339a932cdb9690418cf67b5854b1412d6
+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.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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOAmidAAoJEEqz6FtPBkyjxlMIAJ2/ZEm7yYLs4X66JSRdyN0L
-A5xw/v1ewUbc/agWQJZRWg73QnHPjbkNSwrpXo6M7C+RBjfacNOhptdDyd9WQ77K
-m0m5GhghOuh28K01YBCKxZmqGLV6kpPqyrHHVzSz+qifGll/4Dz0kN4C44HPxapw
-E1ANWILSIeZwkKlkTJHY5zxpAx7UmgvbaCucVL/fRISjTocR3QTaE0H93pm/sdpj
-HVGbQ3UPKvKFQDLBnperrSylEjyRwb3s+k5tN2O2tbT8K/4w9N9FUuFBoYb/WNrV
-t9jBhbj0YA0Ste1CcASSBlDd1EZ2NhBdLus2sRl1eYQbVZk6Un2GptDuFb98JWY=
-=6iPl
+iEYEAREKAAYFAk4bRkIACgkQgAnW8HDreRYuGACggz1tZAIq9ldED5ckMnUfCI5c
+RTEAnjH1H4mtRMqP/UJykc9YvsiI4y0K
+=vate
 -----END PGP SIGNATURE-----
diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml
index 85e9de949327..6b58f9a40e44 100644
--- a/app-office/scribus/metadata.xml
+++ b/app-office/scribus/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
-  <maintainer>
-    <email>hanno@gentoo.org</email>
-    <name>Hanno Boeck</name>
-  </maintainer>
-  <use>
-    <flag name="minimal">Don't install headers (only required for e.g. plug-in developers)</flag>
-  </use>
+	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>hanno@gentoo.org</email>
+		<name>Hanno Boeck</name>
+	</maintainer>
+	<use>
+		<flag name="minimal">Don't install headers (only required for e.g. plug-in developers)</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-office/scribus/scribus-1.3.6.ebuild b/app-office/scribus/scribus-1.3.6.ebuild
index 16403c37276e..76e7bc1b4e5c 100644
--- a/app-office/scribus/scribus-1.3.6.ebuild
+++ b/app-office/scribus/scribus-1.3.6.ebuild
@@ -1,8 +1,9 @@
-# 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/app-office/scribus/scribus-1.3.6.ebuild,v 1.10 2010/11/08 13:00:32 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.6.ebuild,v 1.11 2011/07/11 18:51:40 jlec Exp $
 
 EAPI=2
+
 PYTHON_DEPEND="2:2.6"
 
 inherit cmake-utils fdo-mime multilib python
@@ -16,17 +17,19 @@ SLOT="0"
 KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="cairo debug +minimal +pdf spell"
 
-COMMON_DEPEND="dev-libs/hyphen
+COMMON_DEPEND="
+	dev-libs/hyphen
 	dev-libs/libxml2
 	media-libs/fontconfig
-	>=media-libs/freetype-2
-	virtual/jpeg
-	=media-libs/lcms-1*
+	media-libs/freetype:2
+	media-libs/lcms:0
 	media-libs/libpng
 	media-libs/tiff
 	net-print/cups
 	sys-libs/zlib
+	x11-libs/qt-core:4
 	x11-libs/qt-gui:4
+	virtual/jpeg
 	spell? ( app-text/aspell )
 	pdf? ( app-text/podofo )
 	cairo? ( x11-libs/cairo[X,svg] )"
diff --git a/app-office/scribus/scribus-1.3.8.ebuild b/app-office/scribus/scribus-1.3.8.ebuild
index e6a15c8b434f..9b076cdae65a 100644
--- a/app-office/scribus/scribus-1.3.8.ebuild
+++ b/app-office/scribus/scribus-1.3.8.ebuild
@@ -1,8 +1,9 @@
-# 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/app-office/scribus/scribus-1.3.8.ebuild,v 1.2 2010/11/08 13:00:32 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.8.ebuild,v 1.3 2011/07/11 18:51:40 jlec Exp $
 
 EAPI=2
+
 PYTHON_DEPEND="2:2.6"
 
 inherit cmake-utils fdo-mime multilib python
@@ -20,14 +21,15 @@ COMMON_DEPEND="
 	dev-libs/hyphen
 	dev-libs/libxml2
 	media-libs/fontconfig
-	>=media-libs/freetype-2
-	virtual/jpeg
-	=media-libs/lcms-1*
+	media-libs/freetype:2
+	media-libs/lcms:0
 	media-libs/libpng
 	media-libs/tiff
 	net-print/cups
 	sys-libs/zlib
+	x11-libs/qt-core:4
 	x11-libs/qt-gui:4
+	virtual/jpeg
 	spell? ( app-text/aspell )
 	pdf? ( app-text/podofo )
 	cairo? ( x11-libs/cairo[X,svg] )"
diff --git a/app-office/scribus/scribus-1.3.9.ebuild b/app-office/scribus/scribus-1.3.9.ebuild
index a626f03f73fe..3d36f3cf4d6d 100644
--- a/app-office/scribus/scribus-1.3.9.ebuild
+++ b/app-office/scribus/scribus-1.3.9.ebuild
@@ -1,8 +1,9 @@
 # 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.3.9.ebuild,v 1.3 2011/05/07 18:00:52 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.9.ebuild,v 1.4 2011/07/11 18:51:40 jlec Exp $
 
 EAPI=2
+
 PYTHON_DEPEND="2:2.6"
 
 inherit cmake-utils fdo-mime multilib python
@@ -20,14 +21,15 @@ COMMON_DEPEND="
 	dev-libs/hyphen
 	dev-libs/libxml2
 	media-libs/fontconfig
-	>=media-libs/freetype-2
-	virtual/jpeg
-	=media-libs/lcms-1*
+	media-libs/freetype:2
+	media-libs/lcms:0
 	media-libs/libpng
 	media-libs/tiff
 	net-print/cups
 	sys-libs/zlib
+	x11-libs/qt-core:4
 	x11-libs/qt-gui:4
+	virtual/jpeg
 	spell? ( app-text/aspell )
 	pdf? ( app-text/podofo )
 	cairo? ( x11-libs/cairo[X,svg] )"
diff --git a/app-office/scribus/scribus-1.4.0_rc3.ebuild b/app-office/scribus/scribus-1.4.0_rc3.ebuild
index 816c6ad116b7..6d976137dd30 100644
--- a/app-office/scribus/scribus-1.4.0_rc3.ebuild
+++ b/app-office/scribus/scribus-1.4.0_rc3.ebuild
@@ -1,13 +1,15 @@
 # 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.1 2011/06/03 22:57:52 radhermit Exp $
+# $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 $
 
 EAPI=2
+
 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"
@@ -22,14 +24,14 @@ COMMON_DEPEND="
 	dev-libs/libxml2
 	media-libs/fontconfig
 	media-libs/freetype:2
-	virtual/jpeg
 	media-libs/lcms:0
 	media-libs/libpng
 	media-libs/tiff
 	net-print/cups
 	sys-libs/zlib
-	x11-libs/qt-gui:4
 	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	virtual/jpeg
 	spell? ( app-text/aspell )
 	pdf? ( app-text/podofo )
 	cairo? ( x11-libs/cairo[X,svg] )"
diff --git a/app-office/scribus/scribus-1.4.0_rc5.ebuild b/app-office/scribus/scribus-1.4.0_rc5.ebuild
index f8d958bafda1..356647ec9349 100644
--- a/app-office/scribus/scribus-1.4.0_rc5.ebuild
+++ b/app-office/scribus/scribus-1.4.0_rc5.ebuild
@@ -1,13 +1,15 @@
 # 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.1 2011/06/22 22:11:32 radhermit Exp $
+# $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 $
 
 EAPI=2
+
 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"
@@ -22,14 +24,14 @@ COMMON_DEPEND="
 	dev-libs/libxml2
 	media-libs/fontconfig
 	media-libs/freetype:2
-	virtual/jpeg
 	media-libs/lcms:0
 	media-libs/libpng
 	media-libs/tiff
 	net-print/cups
 	sys-libs/zlib
-	x11-libs/qt-gui:4
 	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	virtual/jpeg
 	spell? ( app-text/aspell )
 	pdf? ( app-text/podofo )
 	cairo? ( x11-libs/cairo[X,svg] )"