diff options
Diffstat (limited to 'x11-libs/qt-assistant')
| -rw-r--r-- | x11-libs/qt-assistant/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qt-assistant/Manifest | 19 | ||||
| -rw-r--r-- | x11-libs/qt-assistant/files/qt-assistant-4.6.1-tools.patch | 38 | ||||
| -rw-r--r-- | x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild | 4 |
4 files changed, 62 insertions, 5 deletions
diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog index 10f11cde9211..a9aaafe5e813 100644 --- a/x11-libs/qt-assistant/ChangeLog +++ b/x11-libs/qt-assistant/ChangeLog @@ -1,6 +1,10 @@ # 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.67 2010/01/19 17:15:30 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.68 2010/01/19 19:08:50 spatz Exp $ + + 19 Jan 2010; Dror Levin <spatz@gentoo.org> qt-assistant-4.6.1.ebuild, + +files/qt-assistant-4.6.1-tools.patch: + Fix patch for 4.6.1, bug 301559. 19 Jan 2010; Ben de Groot <yngwin@gentoo.org> qt-assistant-4.6.1.ebuild: Fix patch filename diff --git a/x11-libs/qt-assistant/Manifest b/x11-libs/qt-assistant/Manifest index 495c4ecf6125..d00ca0370e36 100644 --- a/x11-libs/qt-assistant/Manifest +++ b/x11-libs/qt-assistant/Manifest @@ -1,9 +1,24 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + AUX qt-assistant-4.6.0_rc1-tools.patch 1060 RMD160 439c72c021fc7e42c11c566b97c72f27995dee33 SHA1 fbbb45220c581c28150e822cb5149f2dc7eab21c SHA256 4ae2e420b90bda3d14364fc6f06c9d10cc65deded464ab6b02b9785a44646c8b +AUX qt-assistant-4.6.1-tools.patch 1295 RMD160 56bb84147cd6026a567cc5a355be4a8f048609c4 SHA1 c352cc869b252beb9241a26835b8e714911c0c09 SHA256 d41d566f76fe9184c4a1f055d08999946c4c820bb1a6ae391483f8f1f6be4494 DIST qt-everywhere-opensource-src-4.6.0.tar.gz 155679111 RMD160 7842b9f4a5364016677fc2162dfd31f1440bb05d SHA1 c2cbbde83f1ebac3b8dd13a112fcad757d395041 SHA256 55259c813324f6383cbd441aa2f23e01c320b6d63fbe3b5d52a7715055d28589 DIST qt-everywhere-opensource-src-4.6.1.tar.gz 160197277 RMD160 7365dfe3c688df36002d2c9aaef6b79ba8175402 SHA1 d3b44ae6d9bc9c44fc57f32e545b92daf0b54775 SHA256 4c84b39b8a2546854ce9c0c9f761dd55da76dab2c33eeb876e3d17db1d2ea0c5 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.0-r1.ebuild 2574 RMD160 22cc04aef2c87543ad63110806848d20550b2783 SHA1 b7158c2c74fbbea6b028d6e8b60eec92a744f116 SHA256 e106e26ec2587c295ba42109810fc70d450737d6f9df26fa3aa429f60b015bcd -EBUILD qt-assistant-4.6.1.ebuild 2574 RMD160 9c1167d437c672bdd9d4bb2b5a10a501cce2c08c SHA1 29eb7c1f30fbedcd557cdd603a279ddf366a9c6a SHA256 ea53ed3cadbdaa2eaa7d9c2b893f691a573bc04338d14e87ee1f33db43929a09 -MISC ChangeLog 9350 RMD160 b7c6ceb832d0db2781567d6ca7e8379e85292209 SHA1 549e467117ecfc5604905c7500d555b450392a77 SHA256 490eb7e0085cdf4d9a33ac7f5f71c7da88856ccb2b6e56ab918607325ff5e13f +EBUILD qt-assistant-4.6.1.ebuild 2562 RMD160 14d8885c5edc7b25e50b908a8afca8b73221b149 SHA1 05ae2eb5244b0f51c9fa3d7f5870928d4d7791fc SHA256 c12187f053c12d3dd55927d4cf53a16a2150665d0ce99c6e8ae9be96bff40cff +MISC ChangeLog 9498 RMD160 1ceea9c3fff09c60f84af482d864796ff8eb6b4b SHA1 4383c5155d17f11d3cb3e4159ab056976d4b58ad SHA256 fd7e47aaa9b3dd0484fd01c12066306613ef277269c6a1f5c8bd939bc2e74f4d MISC metadata.xml 157 RMD160 84dc01e4115bf31e84059fa795c95e94ad39df23 SHA1 fe6fa39ce2ba5cd6a8e7da28113fe05e22b5a39a SHA256 a2ffc792d4df94c3f8088e329c4bf74804540c2797f3e24ab0030acbdfd4b535 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iQEcBAEBCgAGBQJLVgNJAAoJEAWF714uGAc69ZwIAIibp+Livuloiiesimc8noA8 +0c+L3x+hXooMDlXOZZbpzCYwOKnlF2VCHtrh/l5YQg90oNRc0EfvmALf84M3aI+Q +T/2Pejs44yy9dKM0hIyMQsh9lygPeH7rmMFIs1h0kX1A0kBkwgwivo1iVonYAIZJ +3nYEgUqalL+f80TP8Y7yYtBDMuzFFSJLwodiomfcF9pEEm/79PwcxpzvFrq0rQQu +oPMOfBcmOWYMqWEfOLOFhILCgnZfMHOFZ3lT9Q6xk3y/wRya9bfN0KtpIrBvBrK2 +9CD9EpHOQwc8SLJ5xTBAoo73TRAPqCycSk9D7fheeqrrEN+Ecygu96PKUpdCqV4= +=/9xl +-----END PGP SIGNATURE----- diff --git a/x11-libs/qt-assistant/files/qt-assistant-4.6.1-tools.patch b/x11-libs/qt-assistant/files/qt-assistant-4.6.1-tools.patch new file mode 100644 index 000000000000..080776ce3f20 --- /dev/null +++ b/x11-libs/qt-assistant/files/qt-assistant-4.6.1-tools.patch @@ -0,0 +1,38 @@ +diff -ur qt-everywhere-opensource-src-4.6.1-orig/tools/tools.pro qt-everywhere-opensource-src-4.6.1/tools/tools.pro +--- qt-everywhere-opensource-src-4.6.1-orig/tools/tools.pro 2010-01-15 19:01:30.000000000 +0200 ++++ qt-everywhere-opensource-src-4.6.1/tools/tools.pro 2010-01-19 21:03:04.747379416 +0200 +@@ -4,33 +4,9 @@ + message("Some graphics-related tools are unavailable without PNG support") + } else { + SUBDIRS += assistant \ +- pixeltool \ +- porting \ +- qtestlib \ +- qttracereplay +- contains(QT_EDITION, Console) { +- SUBDIRS += designer/src/uitools # Linguist depends on this +- } else { +- SUBDIRS += designer +- } +- SUBDIRS += linguist +- symbian: SUBDIRS = designer +- wince*: SUBDIRS = qtestlib designer +- unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig +- win32:!wince*:SUBDIRS += activeqt ++ pixeltool + } + +-mac { +- SUBDIRS += macdeployqt +-} +- +-embedded:SUBDIRS += kmap2qmap +- +-contains(QT_CONFIG, declarative):SUBDIRS += qmlviewer qmldebugger +-contains(QT_CONFIG, dbus):SUBDIRS += qdbus +-!wince*:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns xmlpatternsvalidator +-embedded: SUBDIRS += makeqpf +- + !wince*:!cross_compile:SUBDIRS += qdoc3 + + CONFIG+=ordered diff --git a/x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild b/x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild index 37c4a2b884a8..b866b401f5e7 100644 --- a/x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild +++ b/x11-libs/qt-assistant/qt-assistant-4.6.1.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.1.ebuild,v 1.2 2010/01/19 17:15:30 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild,v 1.3 2010/01/19 19:08:50 spatz Exp $ EAPI="2" inherit qt4-build @@ -15,7 +15,7 @@ DEPEND="~x11-libs/qt-gui-${PV}[aqua=] ~x11-libs/qt-webkit-${PV}[aqua=]" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-4.6.0_rc1-tools.patch" ) +PATCHES=( "${FILESDIR}/${P}-tools.patch" ) # Pixeltool isn't really assistant related, but it relies on # the assistant libraries. doc/qch/ |