summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-12-12 16:34:57 +0000
committerJustin Lecher <jlec@gentoo.org>2012-12-12 16:34:57 +0000
commitf777127bbeb2b933038ffd70b1ee9b26351a4db4 (patch)
tree69785d6e34321ff43518042cfeba46e3ef2aa0e5 /app-office
parentFix symlinks in /usr/bin and mandir. (diff)
downloadgentoo-2-f777127bbeb2b933038ffd70b1ee9b26351a4db4.tar.gz
gentoo-2-f777127bbeb2b933038ffd70b1ee9b26351a4db4.tar.bz2
gentoo-2-f777127bbeb2b933038ffd70b1ee9b26351a4db4.zip
app-office/texmaker: Drop glu.h patch, as it seems to work without; fixes #447004
(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/texmaker/ChangeLog6
-rw-r--r--app-office/texmaker/metadata.xml10
-rw-r--r--app-office/texmaker/texmaker-3.3.4.ebuild6
-rw-r--r--app-office/texmaker/texmaker-3.5.2.ebuild7
4 files changed, 18 insertions, 11 deletions
diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index d7741328b9ec..560fd666b742 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/texmaker
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.114 2012/12/10 08:09:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.115 2012/12/12 16:34:57 jlec Exp $
+
+ 12 Dec 2012; Justin Lecher <jlec@gentoo.org> texmaker-3.3.4.ebuild,
+ texmaker-3.5.2.ebuild, metadata.xml:
+ Drop glu.h patch, as it seems to work without; fixes #447004
10 Dec 2012; Justin Lecher <jlec@gentoo.org> -texmaker-3.1.ebuild,
-texmaker-3.5.ebuild, -texmaker-3.5.1.ebuild:
diff --git a/app-office/texmaker/metadata.xml b/app-office/texmaker/metadata.xml
index fbd97be70553..b04ffda9695b 100644
--- a/app-office/texmaker/metadata.xml
+++ b/app-office/texmaker/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>tex</herd>
- <maintainer>
- <email>jlec@gentoo.org</email>
- <description>Heavily using the package</description>
- </maintainer>
+ <herd>tex</herd>
+ <maintainer>
+ <email>jlec@gentoo.org</email>
+ <description>Heavily using the package</description>
+ </maintainer>
</pkgmetadata>
diff --git a/app-office/texmaker/texmaker-3.3.4.ebuild b/app-office/texmaker/texmaker-3.3.4.ebuild
index 9e5c8aa667e4..85eddeaa07c1 100644
--- a/app-office/texmaker/texmaker-3.3.4.ebuild
+++ b/app-office/texmaker/texmaker-3.3.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.3.4.ebuild,v 1.6 2012/12/08 12:36:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.3.4.ebuild,v 1.7 2012/12/12 16:34:57 jlec Exp $
EAPI=4
@@ -31,14 +31,16 @@ IUSE=""
S="${WORKDIR}/${MY_P}"
COMMON_DEPEND="
+ app-text/hunspell
app-text/poppler[qt4]
sys-libs/zlib
+ virtual/glu
x11-libs/libX11
x11-libs/libXext
x11-libs/qt-gui:4
x11-libs/qt-core:4
x11-libs/qt-webkit:4
- app-text/hunspell"
+"
RDEPEND="${COMMON_DEPEND}
virtual/latex-base
app-text/psutils
diff --git a/app-office/texmaker/texmaker-3.5.2.ebuild b/app-office/texmaker/texmaker-3.5.2.ebuild
index 59cd152c05c8..a485bd5df9f1 100644
--- a/app-office/texmaker/texmaker-3.5.2.ebuild
+++ b/app-office/texmaker/texmaker-3.5.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.5.2.ebuild,v 1.1 2012/11/07 15:45:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.5.2.ebuild,v 1.2 2012/12/12 16:34:57 jlec Exp $
EAPI=4
@@ -31,6 +31,7 @@ IUSE=""
S="${WORKDIR}/${MY_P}"
COMMON_DEPEND="
+ app-text/hunspell
app-text/poppler[qt4]
sys-libs/zlib
x11-libs/libX11
@@ -38,7 +39,7 @@ COMMON_DEPEND="
x11-libs/qt-gui:4
x11-libs/qt-core:4
x11-libs/qt-webkit:4
- app-text/hunspell"
+"
RDEPEND="${COMMON_DEPEND}
virtual/latex-base
app-text/psutils
@@ -49,7 +50,7 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}"/${P}-hunspell.patch
- "${FILESDIR}"/${PN}-3.3.3-qt48.patch
+# "${FILESDIR}"/${PN}-3.3.3-qt48.patch
)
src_configure() {
eqmake4 \