Finally fixing bug #318163

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog
index 7b9d7e10680e1f6e6f20e9bbf900064448b49fc0..61813722477f67ece21f2e743ffca056d8d65dbb 100644 (file)
--- a/x11-libs/qt-assistant/ChangeLog
+++ b/x11-libs/qt-assistant/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-assistant
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.77 2010/05/02 19:22:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.78 2010/05/04 13:49:28 hwoarang Exp $
+
+*qt-assistant-4.6.2-r2 (04 May 2010)
+
+  04 May 2010; Markos Chandras <hwoarang@gentoo.org>
+  -qt-assistant-4.6.2-r1.ebuild, +qt-assistant-4.6.2-r2.ebuild:
+  Finally fixing bug #318163
 
   02 May 2010; Markos Chandras <hwoarang@gentoo.org>
   qt-assistant-4.6.2-r1.ebuild:

diff --git a/x11-libs/qt-assistant/Manifest b/x11-libs/qt-assistant/Manifest
index c4509f541ab338aa959780a517aa01a3026c0704..12c216a2e5387891309f2fc9d57f039f676365e0 100644 (file)
--- a/x11-libs/qt-assistant/Manifest
+++ b/x11-libs/qt-assistant/Manifest
@@ -4,7 +4,7 @@ DIST qt-everywhere-opensource-src-4.6.2.tar.gz 160601949 RMD160 5f3fea120f2dba27
 DIST qt-x11-opensource-src-4.5.3.tar.gz 125384668 RMD160 93d765ecf89ed15668a4eedc7d77c2a2e41424a2 SHA1 78620ffd03c83c4d86f5039ccf7b09e5c709ed25 SHA256 0c87fc42825d3556970db4412257c6874e716ac3bc45e6f273924d5d6a089aa6
 EBUILD qt-assistant-4.5.3.ebuild 1948 RMD160 4518902a30f64365f1f294fe6a956e84c6b5870b SHA1 b4000b63138416ddc29302d0d5a7eeefb5996f70 SHA256 156175ff19b90f552ce919a9e43c7b9ebe91e46b43f684b9747d33271822cf03
 EBUILD qt-assistant-4.6.1.ebuild 2562 RMD160 14d8885c5edc7b25e50b908a8afca8b73221b149 SHA1 05ae2eb5244b0f51c9fa3d7f5870928d4d7791fc SHA256 c12187f053c12d3dd55927d4cf53a16a2150665d0ce99c6e8ae9be96bff40cff
-EBUILD qt-assistant-4.6.2-r1.ebuild 2744 RMD160 ed5b6f046f4d1143ddb43aafc4f8f2a8db6f1700 SHA1 b0f46dbba5b58758a33aa6664cb5a494f6554dc6 SHA256 92d3de3c8e713b18a76df59c8d04df8df55e2e1c410d5d41e706ac89f11ad785
+EBUILD qt-assistant-4.6.2-r2.ebuild 2772 RMD160 27062096cd4862a851bf182c3614be3a2a7f7974 SHA1 8171e27d201252ef08fad9cc97ee04461467d462 SHA256 359376bed56036c563799f9e8ffd400c7f7cd74b93c1ca0adfad196fbbb9efa3
 EBUILD qt-assistant-4.6.2.ebuild 2567 RMD160 81cf2642b4a18592ae1447aea7a7f9de0b0ab2d5 SHA1 2cdbb3b7ecd4d009437ad5e88bf5a500830508fc SHA256 0fd6558566b26cb1574fd174c99432973a17a8b710c2fbb2efcb86fbef01ed46
-MISC ChangeLog 10581 RMD160 cf357a65c231601f4085ce85b3ab42dbd20d5b9b SHA1 8c8ed5278f43e830bea6f3211301b4314c2df1e8 SHA256 70cffac24768fbad6db909f29112d61a8850986b7353140e40338b4c372e7086
+MISC ChangeLog 10766 RMD160 00a932cf7c816d6af2b2cb48d19f9e611be24a86 SHA1 f01f590648d29303331d58ca0c92dd47bda4d350 SHA256 84eb8a62d2894b342cfd116830fda25bff4c90709f47377985d083b5d1a7f416
 MISC metadata.xml 446 RMD160 f2349ee236a499cf4f214aa0fbae5c49b8d521a8 SHA1 21e50e088724d4e0a1548ae08e229a71435e439a SHA256 c1d5995283f983bcef7089584da8edbfe88406456c32e9bf3e8288f829a2986f

diff --git a/x11-libs/qt-assistant/qt-assistant-4.6.2-r1.ebuild b/x11-libs/qt-assistant/qt-assistant-4.6.2-r2.ebuild
similarity index 94%
rename from x11-libs/qt-assistant/qt-assistant-4.6.2-r1.ebuild
rename to x11-libs/qt-assistant/qt-assistant-4.6.2-r2.ebuild
index 36e6f9c413a441bc25683121558b0500b8b0150d..ed09925c2aa47e873ffaae1f0d59aeed89069919 100644 (file)
--- a/x11-libs/qt-assistant/qt-assistant-4.6.2-r1.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.6.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.2-r1.ebuild,v 1.3 2010/05/02 19:33:23 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.2-r2.ebuild,v 1.1 2010/05/04 13:49:28 hwoarang Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -32,7 +32,8 @@ include/
 doc/"
 
 pkg_setup() {
-       use trace && QT4_TARGET_DIRECTORIES="tools/qttracereplay"
+       use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+               tools/qttracereplay"
        QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} \
                ${QT4_EXTRACT_DIRECTORIES}"
        qt4-build_pkg_setup