Adjust all ebuilds to each other

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

7 files changed, 46 insertions, 30 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/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] )"