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

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

5 files changed, 23 insertions, 29 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/Manifest b/kde-base/kdelibs/Manifest
index eeabf6f4d49d..fc371f2cf409 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX dist/01_gentoo_set_xdg_menu_prefix-1.patch 592 RMD160 80ac0ae419f0f721a044053cdaeaf2f1f982f74e SHA1 80e9a70b108cab0b05efc50d6fa66665b711f149 SHA256 dea20e8a0e8f0ecc1aec1b38cec994312514aa1e88ba25fede01e1953623f341
 AUX dist/01_gentoo_set_xdg_menu_prefix.patch 606 RMD160 37290ce06adf1cf43b0006c02804d7fe762ed609 SHA1 8e86e06a70438c12085a595fd66e2354141fb056 SHA256 9c64b093340d7d25ce6c28d298cd62f3f4da141b762c663df9cd9b5b7722f7d3
@@ -28,25 +28,15 @@ DIST kdelibs-4.7.0.tar.bz2 12032091 RMD160 8bcc65072818285031f5611f4b183a74ad0f4
 DIST kdelibs-4.7.1.tar.bz2 12074524 RMD160 1bbe819fb1b0c3223fb8f2cdc371f099d367cf8b SHA1 661cc56f199b7250bd825cc0e85ff442b85171e2 SHA256 3c32b3ab1e1fe6d50fceec6075b62cf83e8dc74ba795820947b5a42a328d8fbf
 EBUILD kdelibs-4.6.3-r2.ebuild 10274 RMD160 c748b1ac47cd5f75ae30e59659d6f8057a95f868 SHA1 245188128967bcb12a4ebf016cd56a22b6b32360 SHA256 5e468ac3ce1a8af33dcf0faa6dfe999a86d2445b621243e2519dd57d29bd379d
 EBUILD kdelibs-4.6.5-r1.ebuild 10225 RMD160 aef9c6922a3c5a82c1aa383335917d1245ba06e8 SHA1 1902170d6a79c851b48da35a7d2e8ef119c6228a SHA256 dd3b27125574655dbf525f0d90e8855d3fad786ea5af8bfc99ae81a04b29dd7f
-EBUILD kdelibs-4.7.0-r1.ebuild 9799 RMD160 d26d79209a7d849e40b5710e1071498901578e5c SHA1 895a9ef91374c0a44aa4ff6ac336d2aeaeb6fb5b SHA256 79ebaa6afccb6d1ca93a417f9f4136e0356512077a810f7d88881fa93dae8c4e
-EBUILD kdelibs-4.7.1-r1.ebuild 9843 RMD160 e9322ba24e9b48f37dcf90ac37e30d05176bb1c0 SHA1 f6f115a49dd069839f22865086a8e15652615cfa SHA256 3d83efe02635e1a628fc9edd12084271c148e8622aeaee79fd170b3243afb5b5
-EBUILD kdelibs-4.7.1-r2.ebuild 9873 RMD160 4af7093d986546371951ddcf6162022566a97f2d SHA1 cad604a62acbae461e7437697089e563fa9e0044 SHA256 b22c6ddbe2e4232b3dea1a6a72882219f2a713682070f91c1e5ef857e539ef13
-MISC ChangeLog 131744 RMD160 73ff1b24b2269c0ec52a79f6d0782f66a33e52d7 SHA1 f13e0b50f82afefe31096c4d970200da42fd29d8 SHA256 9e2989959c95f9ae53630d59725afbeea4132c60aa37e9f0c82e8e4d1b2d75ab
+EBUILD kdelibs-4.7.0-r1.ebuild 9798 RMD160 a30286f40043f787a806be514d43966b839c4d96 SHA1 644a6d5056c4cdab6ebf44cb445b0718a307461c SHA256 f9e3978ed0fbb03fbb28a682e7bf8d6ce740532a5822301013c70286b72f54e3
+EBUILD kdelibs-4.7.1-r1.ebuild 9842 RMD160 08c267ac691afec3e0f6f344e71197cee1c03199 SHA1 2acc9185f63ab60a498f8d923aa924e278780948 SHA256 551c93dd5b2cd94eba2eac2b3ede30c03f3a60cad1cdb3d7f319c2d1696465a4
+EBUILD kdelibs-4.7.1-r2.ebuild 9877 RMD160 e0028b17d4861ceeaec565306ee61ca71dc56ec7 SHA1 93453f71c10e86b3ad5bb35e9703236cde9fde84 SHA256 557689a1aebb448bd3c72fb658d08a4cd992a586e69d6672c25673aa13d41e4e
+MISC ChangeLog 131941 RMD160 57333a9041b2ead76554c157743ba987968ca512 SHA1 33f202f366ad281235006383cbe98824da1bbd5a SHA256 176517300125054bed5ae8d5865448c96732ce4762ac28b627e0aff95729bf45
 MISC metadata.xml 443 RMD160 765aa5080e9ecee24e26f5b8a5168e674db2ffd2 SHA1 82f77d1dc84732dbedcdebbac460896bd6b5484b SHA256 79624eb4920e9849ea5ce593a5adc8c7e45cd9670f9f63a64cf00a637de2d701
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOgkLLAAoJELHSF2kinlg4JT8P/RxtLz6ROE1h4Kpfw7BTWcnF
-Gvg2YxZQJgfKAh8clDlYtQSdqw+gHYz4x96bFyVunxGYX8wNiEDIo+LQMI33JzzE
-brnjs83MX4KQ0CzM3lqX1Z+i4QYrJfsZ7QIf3LFZIYbJwPOTieoXnAj7WCV+d0AD
-WIM2HeVvwUtgTZtoDF2HTbDFut4WWN9E7TPIPIqoOGWYLKnsNTbRg47hoVYoUows
-4RNkI9cnyXBflb1sH+ibvsypYAzNBjzmGqK96u86u523Mj6NtkkMXARPv1dNXd+D
-ziIrNvXFUuNZOOhUANYVtZ0/Whm7QfdsbrAUwx8Dwuay3y6H/Wouc9YcVACvZmwt
-USYZ+Zizds6+sWMyk1Wt0sw+Q/XLT8MdCQa31FHq1M+bEtTZP9nzU3PuBmkdveiF
-qLoZL9nNMk4axGBpPux5UR1VudfcuQCVGfeQnx+ghtwAdNRAW6vhEbuxMm96VYgP
-GTxijT0HNkRHVjQ51xp48qouJE3kaI2tMKcWRV3mgVagAGbuth+As+pz5pKq0gjX
-yaT4SYHDhItZr6B7XlY3EqLaOkpBF8SYnhFhfidHwJirn6nd2AgN71jigzroxge7
-7cQRlvZtpDukM9cRfNsPxO6N1dkngW9eA9hC4O6AtJDNs7eI+R1+d8qfUP9A/Jgt
-wgN7aDsxrzxfcxiQ3ccr
-=1vZg
+iEYEARECAAYFAk6IubAACgkQFuHa/bHpVds7xgCfQ6RAuoRbYF+JfhYwEUpKYNeF
+sSQAn2KBir5yC1vGKyn/4LMSyQiEUimO
+=4Zt+
 -----END PGP SIGNATURE-----
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 )
 "