Revert change proposed in bug, 379733 - not the way to go.

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

4 files changed, 14 insertions, 10 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 6e2ce839b5b1..51c0260a3dbf 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.788 2011/09/27 21:40:11 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.789 2011/10/02 19:21:14 reavertm Exp $
+
+  02 Oct 2011; Maciej Mrozowski <reavertm@gentoo.org> kdelibs-4.7.0-r1.ebuild,
+  kdelibs-4.7.1-r1.ebuild, kdelibs-4.7.1-r2.ebuild:
+  Revert change proposed in bug, 379733 - not the way to go.
 
 *kdelibs-4.7.1-r2 (27 Sep 2011)
 
diff --git a/kde-base/kdelibs/kdelibs-4.7.0-r1.ebuild b/kde-base/kdelibs/kdelibs-4.7.0-r1.ebuild
index 0888a29901f1..c876985d48d3 100644
--- a/kde-base/kdelibs/kdelibs-4.7.0-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.7.0-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/kde-base/kdelibs/kdelibs-4.7.0-r1.ebuild,v 1.2 2011/08/27 12:11:20 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.0-r1.ebuild,v 1.3 2011/10/02 19:21:14 reavertm Exp $
 
 EAPI=4
 
@@ -30,8 +30,6 @@ RESTRICT="test"
 COMMONDEPEND="
 	app-crypt/qca:2
 	>=app-misc/strigi-0.6.3
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
 	>=dev-libs/libattica-0.1.90
 	>=dev-libs/libdbusmenu-qt-0.3.2
 	dev-libs/libpcre[unicode]
@@ -89,6 +87,8 @@ COMMONDEPEND="
 	)
 "
 DEPEND="${COMMONDEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
 	doc? ( app-doc/doxygen )
 	nls? ( virtual/libintl )
 "
diff --git a/kde-base/kdelibs/kdelibs-4.7.1-r1.ebuild b/kde-base/kdelibs/kdelibs-4.7.1-r1.ebuild
index 2683b97e21c8..1b1297555ad4 100644
--- a/kde-base/kdelibs/kdelibs-4.7.1-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.7.1-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/kde-base/kdelibs/kdelibs-4.7.1-r1.ebuild,v 1.3 2011/09/26 21:15:36 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.1-r1.ebuild,v 1.4 2011/10/02 19:21:14 reavertm Exp $
 
 EAPI=4
 
@@ -30,8 +30,6 @@ RESTRICT="test"
 COMMONDEPEND="
 	app-crypt/qca:2
 	>=app-misc/strigi-0.7.6
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
 	>=dev-libs/libattica-0.1.90
 	>=dev-libs/libdbusmenu-qt-0.3.2
 	dev-libs/libpcre[unicode]
@@ -89,6 +87,8 @@ COMMONDEPEND="
 	)
 "
 DEPEND="${COMMONDEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
 	doc? ( app-doc/doxygen )
 	nls? ( virtual/libintl )
 "
diff --git a/kde-base/kdelibs/kdelibs-4.7.1-r2.ebuild b/kde-base/kdelibs/kdelibs-4.7.1-r2.ebuild
index a12de0b0d096..20aa54289159 100644
--- a/kde-base/kdelibs/kdelibs-4.7.1-r2.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.7.1-r2.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/kde-base/kdelibs/kdelibs-4.7.1-r2.ebuild,v 1.1 2011/09/27 21:40:11 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.1-r2.ebuild,v 1.2 2011/10/02 19:21:14 reavertm Exp $
 
 EAPI=4
 
@@ -30,8 +30,6 @@ RESTRICT="test"
 COMMONDEPEND="
 	app-crypt/qca:2
 	>=app-misc/strigi-0.7.6
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
 	>=dev-libs/libattica-0.1.90
 	>=dev-libs/libdbusmenu-qt-0.3.2
 	dev-libs/libpcre[unicode]
@@ -89,6 +87,8 @@ COMMONDEPEND="
 	)
 "
 DEPEND="${COMMONDEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
 	doc? ( app-doc/doxygen )
 	nls? ( virtual/libintl )
 "