diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2006-04-19 13:45:11 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2006-04-19 13:45:11 +0000 |
| commit | 4f0c66b1cb6744933b1f0be19e0d7a263dec6aeb (patch) | |
| tree | 7145ec002d8483ad7fd55bf381d17b58afc4de4e /x11-libs | |
| parent | Stable on alpha wrt Bug #123993. (diff) | |
| download | gentoo-2-4f0c66b1cb6744933b1f0be19e0d7a263dec6aeb.tar.gz gentoo-2-4f0c66b1cb6744933b1f0be19e0d7a263dec6aeb.tar.bz2 gentoo-2-4f0c66b1cb6744933b1f0be19e0d7a263dec6aeb.zip | |
Add a die to the ebuild if using the nodoc feature
(Portage version: 2.1_pre7-r5)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qt/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/qt/Manifest | 6 | ||||
| -rw-r--r-- | x11-libs/qt/qt-4.1.2.ebuild | 7 |
3 files changed, 13 insertions, 5 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index e068ba340d21..6a3d6fb879f4 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,9 @@ # 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.302 2006/04/13 12:02:22 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.303 2006/04/19 13:45:03 caleb Exp $ + + 19 Apr 2006; Caleb Tennis <caleb@gentoo.org> qt-4.1.2.ebuild: + Add a die to the ebuild if using nodoc feature 13 Apr 2006; Caleb Tennis <caleb@gentoo.org> qt-3.3.6.ebuild: Fix CHOST naming scheme from bug #128528 diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index 7f78f49f845d..e26bb8cc8ded 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -79,6 +79,6 @@ SHA256 15401e982ff57ff4b47167a15c29dacd95f5ab4cf44dc39eb38e07f6799dd432 qt-3.3.6 MD5 dec77c41b5849f0ebdcde7fa9ea25690 qt-4.1.1.ebuild 6351 RMD160 f301ece0c483410df03fb22be0e381f2e3e5a18e qt-4.1.1.ebuild 6351 SHA256 b67eda7a5fa11318f3887762ab3625832b0ea77a3e7ecd02ae84f9c9eefeefbd qt-4.1.1.ebuild 6351 -MD5 6e51dcf4e49cfce1825c9489bb6c171a qt-4.1.2.ebuild 6310 -RMD160 50856660bc342a1146f74d462dee717683985059 qt-4.1.2.ebuild 6310 -SHA256 6d60a45c2061e0cb97d757c81c282e6f2c8d8dd82de18f7d64b71eafde83b17a qt-4.1.2.ebuild 6310 +MD5 e28ca6b1ca0578522c3e67115b313d13 qt-4.1.2.ebuild 6398 +RMD160 f9c573810a1c76fd2553da75a0b08b5edd7193c4 qt-4.1.2.ebuild 6398 +SHA256 a38b5b3caa504df2de77fe9534a787d22e3964190c75909cc35f0157f43689b5 qt-4.1.2.ebuild 6398 diff --git a/x11-libs/qt/qt-4.1.2.ebuild b/x11-libs/qt/qt-4.1.2.ebuild index 014a75e5df06..9362a6c2ed8c 100644 --- a/x11-libs/qt/qt-4.1.2.ebuild +++ b/x11-libs/qt/qt-4.1.2.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-4.1.2.ebuild,v 1.2 2006/04/07 00:02:52 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.1.2.ebuild,v 1.3 2006/04/19 13:45:11 caleb Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -42,6 +42,11 @@ DEPEND="|| ( ( x11-libs/libXrandr zlib? ( sys-libs/zlib )" pkg_setup() { + if has nodoc ${FEATURES}; then + eerror "Qt-4 is incompatible with the 'nodoc' feature of portage. Please disable this feature and retry" + die + fi + QTBASEDIR=/usr/$(get_libdir)/qt4 QTPREFIXDIR=/usr QTBINDIR=/usr/bin |