Fix installation of libraries (3.3.5 -> ${PV}). Forward port immodule patch to Qt 3.3.6.

Package-Manager: portage-2.1_pre6-r3

4 files changed, 34 insertions, 20 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 7672f307802c..18eb1461f66c 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.293 2006/03/17 20:29:28 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.294 2006/03/17 20:55:25 flameeyes Exp $
+
+  17 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> qt-3.3.6.ebuild:
+  Fix installation of libraries (3.3.5 -> ${PV}). Forward port immodule patch
+  to Qt 3.3.6.
 
   17 Mar 2006; Fabian Groffen <grobian@gentoo.org> qt-3.3.6.ebuild:
   Marked ~ppc-macos, used old 3.3.5 patch to get it compiling (bug #126553)
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 746c07bfa721..4afde1a00795 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,6 +1,9 @@
-MD5 fc8cfc2deb00e37cdd0a69b887c69d95 ChangeLog 7362
-RMD160 5800612713f77c620634310f5868673def6f3cc4 ChangeLog 7362
-SHA256 c28ebcf9bab81abf5fbc8922c012e7ed43fff784161bfd9c510aedc9f53164cf ChangeLog 7362
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e193d6d382b78ad120b44553987716ce ChangeLog 7528
+RMD160 f4672db6918f67b8439bfc018427d56f32d3aed8 ChangeLog 7528
+SHA256 9b56af8a1a38259c5fcf5c7d398416c80c517e6873f915f2e55bf05d07584924 ChangeLog 7528
 MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 files/0001-dnd_optimization.patch 5623
 SHA256 b8c330553cce93475913494a241d6a27fe07bc1b8ef880b9c565342efa7857e1 files/0001-dnd_optimization.patch 5623
@@ -25,9 +28,9 @@ SHA256 b4d24ef5f1e74872de2ad2e5f9cb69747ecfd0ed3c03876605875dd68ef0bebb files/di
 MD5 76a040705fa29dc7da83216569142baf files/digest-qt-3.3.5-r1 590
 RMD160 79d4f921d8013694dd79265328e740b45252b6ee files/digest-qt-3.3.5-r1 590
 SHA256 707e8b079fec72ff5275990e8fac73eb019cd6ace7929a777899e2d71159d38e files/digest-qt-3.3.5-r1 590
-MD5 8e2f0e73b36790cd24cff0a9292778a8 files/digest-qt-3.3.6 590
-RMD160 9920796618b59ce3e6be40d6e99abb131574d3d2 files/digest-qt-3.3.6 590
-SHA256 63eb1bd71bb737e146d4396dcfa3b1925f906f286c61b2664123d390ad1f0c0d files/digest-qt-3.3.6 590
+MD5 cb9c5c7f7299bdac934aa277f9760be4 files/digest-qt-3.3.6 611
+RMD160 51c1e6017e264628589e4dbcdb7ec8de8227bb79 files/digest-qt-3.3.6 611
+SHA256 f0db2f527947c400fd2407bedb02a4463e0baa0c448fe35bffe46d2de070a1f0 files/digest-qt-3.3.6 611
 MD5 fa53e425bec204779eaa1d7b79705f74 files/digest-qt-4.1.0-r1 81
 RMD160 8cccc49ae11ec6a6a2321407e4e83974ecb48cd2 files/digest-qt-4.1.0-r1 81
 SHA256 978ae137f1276ae9af1ca77fad93c55465907b29c0c37d2f52a5c50600745e3b files/digest-qt-4.1.0-r1 81
@@ -97,9 +100,9 @@ SHA256 25c877125a2f11024e1ab8d929ab8e9daca43d7e9c974ee9b0d23da6ae4ec7a7 qt-3.3.5
 MD5 79f2f90628493509cef5843f920efe80 qt-3.3.5.ebuild 10557
 RMD160 1c8ddde347518aa57d475ede75f1ee428795fa70 qt-3.3.5.ebuild 10557
 SHA256 4f51480d530779f6c0fb3ea9f6c508b9731a2febf436daa19c47e329ef710158 qt-3.3.5.ebuild 10557
-MD5 199286f322d7f6a0b855b273e7f5dbf4 qt-3.3.6.ebuild 10511
-RMD160 58caf16cff02d4720c913ce715d2d7a011c300ea qt-3.3.6.ebuild 10511
-SHA256 f85ed9c3e8549c2c4b6d715ff1af4eb662a39d50e98de8509a36cd12f751fef9 qt-3.3.6.ebuild 10511
+MD5 9872809c83006813d6f3a3f000f8184a qt-3.3.6.ebuild 10488
+RMD160 c15cdd42bed2f6eeaae27ffc9bc904e828014df6 qt-3.3.6.ebuild 10488
+SHA256 d63c6d524243d9f23f99443bfca14304b8b3e4311cf827f34e16339c1faf66db qt-3.3.6.ebuild 10488
 MD5 d2603f63c8272769089394a4f2ef8e37 qt-4.1.0-r1.ebuild 6259
 RMD160 c285258c72255415d73bdf0c73aefc3c14bf3725 qt-4.1.0-r1.ebuild 6259
 SHA256 3cb16cf9927dd59274859605bb484bc8c9b1746c2e49bb76c443a4204455a30d qt-4.1.0-r1.ebuild 6259
@@ -109,3 +112,10 @@ SHA256 12afba544cd95d5be5caf7ab0cd634e7e74ed1deb5967e3c1f3af1c0f09a8ec6 qt-4.1.0
 MD5 dec77c41b5849f0ebdcde7fa9ea25690 qt-4.1.1.ebuild 6351
 RMD160 f301ece0c483410df03fb22be0e381f2e3e5a18e qt-4.1.1.ebuild 6351
 SHA256 b67eda7a5fa11318f3887762ab3625832b0ea77a3e7ecd02ae84f9c9eefeefbd qt-4.1.1.ebuild 6351
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEGyJTAiZjviIA2XgRAgU5AJ9cqO9aF4bBLAJZqDJDRV2UVJR0GACfWZhq
+YjbiGFDdcC34GG8mQbmGMfc=
+=d/bM
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qt/files/digest-qt-3.3.6 b/x11-libs/qt/files/digest-qt-3.3.6
index bf39850175d6..935dada8500c 100644
--- a/x11-libs/qt/files/digest-qt-3.3.6
+++ b/x11-libs/qt/files/digest-qt-3.3.6
@@ -1,6 +1,6 @@
 MD5 dc1384c03ac08af21f6fefab32d982cf qt-x11-free-3.3.6.tar.bz2 14565843
 RMD160 84c0b6bc6dc727d40a5a8df29a81aafc743c0161 qt-x11-free-3.3.6.tar.bz2 14565843
 SHA256 04f12083f6a6f7a8fd4d34a6c1efd37db76a67580c424f4fb7b7c43c0565e6ae qt-x11-free-3.3.6.tar.bz2 14565843
-MD5 2d1a6979301ee81da404f63670211416 qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2 110612
-RMD160 18fe91f54f2f18c2b1b2b870b36c7545132ed166 qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2 110612
-SHA256 a3c31dd54aaf1a88222715a2140f9a4ed4eaf240930c94c506bbde15f00f746a qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2 110612
+MD5 08e49b5372bd44f973d8f2263458a5b6 qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200
+RMD160 51e480e651261796622a0d824ad549fd5e90089a qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200
+SHA256 e67d8720903ded64c1e2eadc91f2fd8cfb5d08e0d71addf17499f21a0891df18 qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200
diff --git a/x11-libs/qt/qt-3.3.6.ebuild b/x11-libs/qt/qt-3.3.6.ebuild
index dac56e5ed51e..6b60e28eca9a 100644
--- a/x11-libs/qt/qt-3.3.6.ebuild
+++ b/x11-libs/qt/qt-3.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.6.ebuild,v 1.2 2006/03/17 20:29:28 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.6.ebuild,v 1.3 2006/03/17 20:55:25 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -8,11 +8,11 @@ SRCTYPE="free"
 DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
 HOMEPAGE="http://www.trolltech.com/"
 
-IMMQT_P="qt-x11-immodule-unified-qt3.3.5-20051018"
+IMMQT_P="qt-x11-immodule-unified-qt3.3.6-20060317-gentoo"
 
 SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
-	immqt? ( http://freedesktop.org/~daisuke/${IMMQT_P}.diff.bz2 )
-	immqt-bc? ( http://freedesktop.org/~daisuke/${IMMQT_P}.diff.bz2 )"
+	immqt? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )
+	immqt-bc? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )"
 LICENSE="|| ( QPL-1.0 GPL-2 )"
 
 SLOT="3"
@@ -232,7 +232,7 @@ src_install() {
 	else
 		dolib lib/lib{editor,qassistantclient,designercore}.a
 		dolib lib/libqt-mt.la
-		dolib lib/libqt-mt.so.3.3.5 lib/libqui.so.1.0.0
+		dolib lib/libqt-mt.so.${PV} lib/libqui.so.1.0.0
 		cd ${D}/${QTBASE}/$(get_libdir)
 
 		for x in libqui.so ; do
@@ -242,12 +242,12 @@ src_install() {
 		done
 
 		# version symlinks - 3.3.5->3.3->3->.so
-		ln -s libqt-mt.so.3.3.5 libqt-mt.so.3.3
+		ln -s libqt-mt.so.${PV} libqt-mt.so.3.3
 		ln -s libqt-mt.so.3.3 libqt-mt.so.3
 		ln -s libqt-mt.so.3 libqt-mt.so
 
 		# libqt -> libqt-mt symlinks
-		ln -s libqt-mt.so.3.3.5 libqt.so.3.3.5
+		ln -s libqt-mt.so.${pv} libqt.so.${PV}
 		ln -s libqt-mt.so.3.3 libqt.so.3.3
 		ln -s libqt-mt.so.3 libqt.so.3
 		ln -s libqt-mt.so libqt.so