Version Bump

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 231 insertions, 5 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index 93c01c8ad5b4..08c67e1feb0a 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/texmaker
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.77 2011/03/14 07:59:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.78 2011/04/04 06:56:52 jlec Exp $
+
+*texmaker-3.00 (04 Apr 2011)
+
+  04 Apr 2011; Justin Lecher <jlec@gentoo.org> +texmaker-3.00.ebuild,
+  +files/texmaker-3.00-hunspell.patch:
+  Version Bump
 
 *texmaker-2.30 (14 Mar 2011)
 
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index d76678f810ea..f4dd40839ee4 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -7,24 +7,27 @@ AUX texmaker-2.20-hunspell.patch 3474 RMD160 e38120716f9d5b3f60695b64fbb9042ab2d
 AUX texmaker-2.21-hunspell.patch 3147 RMD160 1e984fcf311d541be6305a2cdccb0584d5cc69cd SHA1 9d65cf92384012b7ac09525513e7f7a2dbbd0bdc SHA256 0b98aa36aefc6fdf55754772af849e29e7d10fc0faa60e9ceafa156a6b94b645
 AUX texmaker-2.22-hunspell.patch 3143 RMD160 fcc3372fe99d54bc6f9f3ff26e58e10b830f4964 SHA1 29b88cfcdc017e2f0426920a88463d2227c11a62 SHA256 5ad268f74249950018b3471b2b99689777cb5c89855ee2f4b9d83ba5bedb026f
 AUX texmaker-2.30-hunspell.patch 3189 RMD160 f53207455df771b1f8b42599b1755b80d604e6bb SHA1 e4c21254c621c76b2bd16306af4651df461b84c0 SHA256 ce52bc469451c58b6b458c35f5d745c061f51c388406622dc5b9a2189b84efda
+AUX texmaker-3.00-hunspell.patch 4119 RMD160 6357d2f7bc6d3099685b6b9b86974f50d3bf50b2 SHA1 8c56d23da77faef662187fc14452aca9ad5e2c1a SHA256 2925022645bd16b68adcd543dd9f5751b4b3762370a27d3b6a414d4a6352e64a
 DIST texmaker-1.9.2.tar.bz2 3094044 RMD160 218f662959843d3417368195d92c16de6970ac9e SHA1 72d2dc0782eeb4da7f0c2694f72ff94ef5168f5e SHA256 6b479788cbce4b940eb78fa011d1ee52c4959c4dc01441ed9a82b045131a10c6
 DIST texmaker-2.1.tar.bz2 3270064 RMD160 1b247a7dabaab5d5f03a384aade83438179f9c28 SHA1 4338bf1ccd24c1644ad65c1a8a40b6741a4e68ed SHA256 e90457448409f2b091bfd28b4be2315048e6a99d5668998be4d08fccfb0904e4
 DIST texmaker-2.2.1.tar.bz2 4060455 RMD160 d69dbd17f63d0877f45fc7408043e1a6b7e8696e SHA1 ba38a1303dc62c90a184c6d36ee96b8d80ee4871 SHA256 79c9efcb4236172f00be3ad776659d541eec9363935a6a99bf06f87ba36b648f
 DIST texmaker-2.2.2.tar.bz2 4061747 RMD160 6a76e65da7c8d54c37cb017adf42249423057138 SHA1 fd2ed495e7d8080d578c0e121ce77b99dec68004 SHA256 7e6378e750e1ab4a3d087415edaf4ae007bfb54935687dbb0fa66468d3475277
 DIST texmaker-2.2.tar.bz2 4061558 RMD160 35c7366fc1ee0794f02ef748bd8f5036e8bb518c SHA1 422f0942dd1eed861e62debadd7e7620ba220fa8 SHA256 56f0569639a2083cb52b0bd08970340063d6b199283dbf3d76a28ae231af8eaa
 DIST texmaker-2.3.tar.bz2 4364743 RMD160 a4db04cb6135d393671a916edb3c272420a98ca3 SHA1 bcd21a3a16ed0a4c38ac4deece29f03d0964431e SHA256 75934ad2fd03f000e65306e336d88e5166284a9222312f88780a492555cc8fd8
+DIST texmaker-3.0.tar.bz2 5158725 RMD160 a2458b095b92d1ecc4b463009c5903089c8e3db3 SHA1 d187b826d520390d9164a2e435bc37127a6dd59a SHA256 4957d1e5f84bf928fa2a16bd094247a55f4fe405457b0738fc7bfbae84b85db2
 EBUILD texmaker-1.92.ebuild 1753 RMD160 d11d85d185e9d3f6cefa58759e3be8d0a2c0a3ee SHA1 a5fd127b284b16e28e5d4d1c1147eaa15c3a398b SHA256 e09d891802ebe1aa034f0a4d5e34dfcb33637c98e07613d9580c84424292b6a9
 EBUILD texmaker-2.10.ebuild 1670 RMD160 65dda95c59e6234cddd69554410a4e7a56bc9aff SHA1 f683b3a044614485fbbfda2cdb53c4a50f0e58b6 SHA256 8f38a5401aa3a2e2f3364eab37d08fb917600f76f657307c18d33f56847115fb
 EBUILD texmaker-2.20.ebuild 1670 RMD160 3ce628ab0ba4b80e9d28c033120987b5a718b001 SHA1 d0e83f0114927b2931094e9cb9d984e2058a500c SHA256 45aa5e4f4e1babcc4d9a8a2ba512267cf12762f49e3e48d47c482e8cabc17bd0
 EBUILD texmaker-2.21.ebuild 1666 RMD160 7cfc8eb5a48a7b6c83a95c0a77b69308c8bcb38b SHA1 05ca7e11d76b163a3b43a3efecad8d536cb2e82c SHA256 eb46c0c9a2ad5f3fbb72262563484f0df601187f185a9092bd5440591ad8cc99
 EBUILD texmaker-2.22.ebuild 1666 RMD160 61f4448bb69c2adbc6e3d7e1931248e0f10c4248 SHA1 dcbe4b51ce0c09e364414f8fc746bdeeacd7dc69 SHA256 75a9bcfe613f8e7d412998be203bdd2f7c6d6392bcd832ce1899de8d94315879
 EBUILD texmaker-2.30.ebuild 1666 RMD160 6ca43860057b0cff791095084d51c27656c4eb0c SHA1 e295a3fbe70eeae2ce5922026c9c7f2cd9b5c92f SHA256 e5b95c6d3ce67a06d23ae9205e5f58b9c45b6f902dbb62af17c280a6e8fc8e1a
-MISC ChangeLog 10910 RMD160 7466a82b838486517a364145f06d499fb64a901d SHA1 bdd9ef7bd3dfe6e4adecd84521d81425204d5166 SHA256 afe53efaaa229cca79dae5bbe1a22c7d63360e7ee1dc74acc69a0ee07a777ac0
+EBUILD texmaker-3.00.ebuild 1666 RMD160 774a05034e7db63edb1a6ccc8a5d24f96593443c SHA1 dbb8891ebb0e0ce1e930f6de2103b7fc859f2f8c SHA256 80793ae348e579a2941c141a0e989e7408f0f48889d5cb939d17f72ee11982d7
+MISC ChangeLog 11065 RMD160 528e07a676c1e79e71241b37a66cea2370457a24 SHA1 2f891d7a094d43be9bbeab24dcbc1d253f840a49 SHA256 2b9196def5eccedba99bec13a34cc6db54616dc98c30a60240b157d2b9ea287e
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk19yuoACgkQgAnW8HDreRYw+gCeNpbY+iyWISPJfYv/jLL3h0TT
-AiUAn1u9vSnSkRXu6kCJiWuWcDif92Ig
-=vkrj
+iEYEARECAAYFAk2Za7YACgkQgAnW8HDreRZZhgCdEyiGMGiPtbN5N5bGuGANnzD8
+47sAnAxYTtrZsd/VRWk0eFLkqfAfyINV
+=jg/8
 -----END PGP SIGNATURE-----
diff --git a/app-office/texmaker/files/texmaker-3.00-hunspell.patch b/app-office/texmaker/files/texmaker-3.00-hunspell.patch
new file mode 100644
index 000000000000..fde04a1c2075
--- /dev/null
+++ b/app-office/texmaker/files/texmaker-3.00-hunspell.patch
@@ -0,0 +1,155 @@
+ configdialog.cpp   |    2 +-
+ latexeditor.h      |    2 +-
+ latexeditorview.h  |    2 +-
+ latexhighlighter.h |    2 +-
+ spellerdialog.h    |    2 +-
+ texmaker.h         |    2 +-
+ texmaker.pro       |   36 +++---------------------------------
+ 7 files changed, 9 insertions(+), 39 deletions(-)
+
+diff --git a/configdialog.cpp b/configdialog.cpp
+index ef30bd4..1acc9d1 100644
+--- a/configdialog.cpp
++++ b/configdialog.cpp
+@@ -122,7 +122,7 @@ void ConfigDialog::browseAspell()
+ QDir spelldir(QCoreApplication::applicationDirPath());
+ #else
+ #ifdef DEBIAN_SPELLDIR
+-QDir spelldir(PREFIX"/share/myspell/dicts");
++QDir spelldir(PREFIX"/share/myspell");
+ #else
+ QDir spelldir(PREFIX"/share/texmaker");
+ #endif
+diff --git a/latexeditor.h b/latexeditor.h
+index b79df23..b482a9a 100644
+--- a/latexeditor.h
++++ b/latexeditor.h
+@@ -26,7 +26,7 @@
+ #include <QTimer>
+ 
+ #include "latexhighlighter.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ 
+ typedef  int UserBookmarkList[3];
+ 
+diff --git a/latexeditorview.h b/latexeditorview.h
+index 0471d6f..f663fdf 100644
+--- a/latexeditorview.h
++++ b/latexeditorview.h
+@@ -19,7 +19,7 @@
+ #include "linenumberwidget.h"
+ #include "findwidget.h"
+ #include "minisplitter.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ 
+ class LatexEditorView : public QWidget  {
+    Q_OBJECT
+diff --git a/latexhighlighter.h b/latexhighlighter.h
+index 83ca79c..a1e437a 100644
+--- a/latexhighlighter.h
++++ b/latexhighlighter.h
+@@ -20,7 +20,7 @@
+ #include <QColor>
+ #include <QTextBlockUserData>
+ //#include "latexeditor.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ 
+ class QTextDocument;
+ class LatexEditor;
+diff --git a/spellerdialog.h b/spellerdialog.h
+index 83248ae..cd16dad 100644
+--- a/spellerdialog.h
++++ b/spellerdialog.h
+@@ -13,7 +13,7 @@
+ 
+ #include "ui_spellerdialog.h"
+ #include "latexeditor.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ 
+ #include <QTextCursor>
+ 
+diff --git a/texmaker.h b/texmaker.h
+index 66d7967..f8e4b57 100644
+--- a/texmaker.h
++++ b/texmaker.h
+@@ -47,7 +47,7 @@
+ #include "logeditor.h"
+ #include "gotolinedialog.h"
+ #include "replacedialog.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ #include "browser.h"
+ #include "pdfviewerwidget.h"
+ #include "pdfviewer.h"
+diff --git a/texmaker.pro b/texmaker.pro
+index 9078988..fb42191 100644
+--- a/texmaker.pro
++++ b/texmaker.pro
+@@ -4,7 +4,8 @@ TARGET	 = texmaker
+ QT += network \
+       xml \
+       webkit
+-CONFIG	+= qt warn_off release
++CONFIG	+= qt warn_off release link_pkgconfig
++PKGCONFIG = hunspell
+ TEXMAKERVERSION=3.0
+ DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
+ DEFINES += HAVE_SPLASH
+@@ -56,25 +57,6 @@ HEADERS	+= texmaker.h \
+ 	usercompletiondialog.h \
+ 	synctex_parser.h \
+ 	synctex_parser_utils.h \
+-	hunspell/affentry.hxx \
+-	hunspell/affixmgr.hxx \
+-	hunspell/atypes.hxx \
+-	hunspell/baseaffix.hxx \
+-	hunspell/csutil.hxx \
+-	hunspell/dictmgr.hxx \
+-	hunspell/hashmgr.hxx \
+-	hunspell/htypes.hxx \
+-	hunspell/hunspell.hxx \
+-	hunspell/hunspell.h \
+-	hunspell/langnum.hxx \
+-	hunspell/license.hunspell \
+-	hunspell/phonet.hxx \
+-	hunspell/suggestmgr.hxx \
+-	hunspell/license.myspell \
+-	hunspell/filemgr.hxx \
+-	hunspell/hunzip.hxx \
+-	hunspell/replist.hxx \
+-	hunspell/w_char.hxx \
+ 	singleapp/qtlocalpeer.h \
+ 	singleapp/qtlockedfile.h \
+ 	singleapp/qtsingleapplication.h \
+@@ -150,18 +132,6 @@ SOURCES	+= main.cpp \
+ 	usercompletiondialog.cpp \
+ 	synctex_parser.c \
+ 	synctex_parser_utils.c \
+-	hunspell/affentry.cxx \
+-	hunspell/affixmgr.cxx \
+-	hunspell/csutil.cxx \
+-	hunspell/dictmgr.cxx \
+-	hunspell/hashmgr.cxx \
+-	hunspell/hunspell.cxx \
+-	hunspell/phonet.cxx \
+-	hunspell/suggestmgr.cxx \
+-	hunspell/utf_info.cxx \
+-	hunspell/filemgr.cxx \
+-	hunspell/replist.cxx \
+-	hunspell/hunzip.cxx \
+ 	singleapp/qtlocalpeer.cpp \
+ 	singleapp/qtlockedfile.cpp \
+ 	singleapp/qtsingleapplication.cpp \
+@@ -253,7 +223,7 @@ LIBS         += -L/usr/lib -lz
+ DEFINES += PREFIX=\\\"$${PREFIX}\\\"
+ target.path = $${PREFIX}/bin
+ 
+-#DEFINES += DEBIAN_SPELLDIR
++DEFINES += DEBIAN_SPELLDIR
+ 
+ INSTALLS = target
+ HEADERS	+= x11fontdialog.h 
diff --git a/app-office/texmaker/texmaker-3.00.ebuild b/app-office/texmaker/texmaker-3.00.ebuild
new file mode 100644
index 000000000000..fde9988e8bea
--- /dev/null
+++ b/app-office/texmaker/texmaker-3.00.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.00.ebuild,v 1.1 2011/04/04 06:56:52 jlec Exp $
+
+EAPI="3"
+
+inherit base qt4-r2 versionator
+
+# The upstream version numbering is bad, so we have to remove a dot in the
+# minor version number
+MAJOR="$(get_major_version)"
+MINOR_1="$(($(get_version_component_range 2)/10))"
+MINOR_2="$(($(get_version_component_range 2)%10))"
+if [ ${MINOR_2} -eq "0" ] ; then
+	MY_P="${PN}-${MAJOR}.${MINOR_1}"
+else
+	MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
+fi
+
+DESCRIPTION="A nice LaTeX-IDE"
+HOMEPAGE="http://www.xm1math.net/texmaker/"
+SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+	app-text/poppler[qt4]
+	x11-libs/libX11
+	x11-libs/libXext
+	>=x11-libs/qt-gui-4.6.1:4
+	>=x11-libs/qt-core-4.6.1:4
+	>=x11-libs/qt-webkit-4.6.1:4
+	>=app-text/hunspell-1.2.4"
+RDEPEND="${COMMON_DEPEND}
+	virtual/latex-base
+	app-text/psutils
+	app-text/ghostscript-gpl
+	media-libs/netpbm"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-hunspell.patch" )
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die "make install failed"
+
+	insinto /usr/share/pixmaps/texmaker
+	doins utilities/texmaker*.png || die "doins failed."
+	doins utilities/texmaker.svg || die "doins failed."
+
+	dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die "dodoc failed"
+}
+
+pkg_postinst() {
+	elog "A user manual with many screenshots is available at:"
+	elog "/usr/share/${PN}/usermanual_en.html"
+}