summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Buisse <nattfodd@gentoo.org>2006-01-15 19:39:18 +0000
committerAlexandre Buisse <nattfodd@gentoo.org>2006-01-15 19:39:18 +0000
commit0255501213f4fd510fd01b56fb149d0eefd501d7 (patch)
tree0dd0a9187dd236cdad968fb4ac53770e69dbab2b /app-office
parentAdded ~sparc keyword wrt bug #60816. (diff)
downloadhistorical-0255501213f4fd510fd01b56fb149d0eefd501d7.tar.gz
historical-0255501213f4fd510fd01b56fb149d0eefd501d7.tar.bz2
historical-0255501213f4fd510fd01b56fb149d0eefd501d7.zip
Added big ewarn about possible qt-4.0/4.1 up/down cycle in emerge world.
Package-Manager: portage-2.1_pre3-r1
Diffstat (limited to 'app-office')
-rw-r--r--app-office/texmaker/ChangeLog5
-rw-r--r--app-office/texmaker/Manifest4
-rw-r--r--app-office/texmaker/texmaker-1.21.ebuild10
3 files changed, 15 insertions, 4 deletions
diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index 1adbc2d936b3..9e570dd0050e 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-office/texmaker
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.15 2006/01/12 01:14:33 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.16 2006/01/15 19:39:18 nattfodd Exp $
+
+ 15 Jan 2006; Alexandre Buisse <nattfodd@gentoo.org> texmaker-1.21.ebuild:
+ Added big ewarn about possible qt-4.0/4.1 up/down cycle in emerge world.
08 Jan 2006; Tobias Scherbaum <dertobi123@gentoo.org>
texmaker-1.11-r1.ebuild:
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index 941692f4ea4c..c0ca33e44176 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,8 +1,8 @@
-MD5 d61f9611e9573d0a6ff50f659f3ce2ae ChangeLog 2193
+MD5 d7176ffe94e3bdc84ea03bca55b38a73 ChangeLog 2345
MD5 6523b9d37f10392c4198cac68935cd93 files/digest-texmaker-1.11 66
MD5 6523b9d37f10392c4198cac68935cd93 files/digest-texmaker-1.11-r1 66
MD5 87c6b930962d1f18ddef65c23a1ccd79 files/digest-texmaker-1.21 67
MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
MD5 53c85051fb2b3d060934596cf6059fa9 texmaker-1.11-r1.ebuild 1500
MD5 4795d01e61e250245aef7dfeabff2d9a texmaker-1.11.ebuild 1395
-MD5 627d8f0211977c2ae3b35b2a20498b8a texmaker-1.21.ebuild 1563
+MD5 9084c6eb9115e81d504e76b19c68ad11 texmaker-1.21.ebuild 1985
diff --git a/app-office/texmaker/texmaker-1.21.ebuild b/app-office/texmaker/texmaker-1.21.ebuild
index 544b1d96fbce..324900da2976 100644
--- a/app-office/texmaker/texmaker-1.21.ebuild
+++ b/app-office/texmaker/texmaker-1.21.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/app-office/texmaker/texmaker-1.21.ebuild,v 1.3 2006/01/12 01:14:33 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-1.21.ebuild,v 1.4 2006/01/15 19:39:18 nattfodd Exp $
inherit eutils versionator
@@ -55,4 +55,12 @@ src_install() {
pkg_postinst() {
einfo "A user manual with many screenshots is available at:"
einfo "/usr/share/doc/${PF}/html/usermanual.html"
+ einfo ""
+ ewarn "texmaker-1.21 does not currently work with qt-4.1, only qt-4.0."
+ ewarn "Unfortunately, portage can not handle this correctly yet, so it is"
+ ewarn "possible that you obtain an infinite qt-4.0/qt-4.1 cycle in your emerge world."
+ ewarn ""
+ ewarn "If that happens, it is suggested to either mask qt-4.1"
+ ewarn " (echo \">=x11-libs/qt-4.1\" >> /etc/portage/package.mask)"
+ ewarn "or downgrade texmaker."
}