version bump, bug #248921

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27.7 x86_64

4 files changed, 170 insertions, 2 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index 378197e34726..b11e4c8529c1 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/texmaker
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.51 2008/11/26 12:58:02 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.52 2008/11/28 10:58:49 aballier Exp $
+
+*texmaker-1.80 (28 Nov 2008)
+
+  28 Nov 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/texmaker-1.80-hunspell.patch, +texmaker-1.80.ebuild:
+  version bump, bug #248921
 
   26 Nov 2008; Ferris McCormick <fmccor@gentoo.org> texmaker-1.71-r1.ebuild:
   Sparc stable, Bug #245518.
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index 7f8c61da45a8..519de46f1ab6 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,7 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX texmaker-1.71-hunspell.patch 1701 RMD160 23feb35af205ad2439a994ceed3a041461de318e SHA1 589ee8691da9a8daf2a4c4ff76209db70eccd3e7 SHA256 0e0cf0106209f320c68b7c3670504d6f71f0b9d36f75bd87854a3df9dace9eb9
+AUX texmaker-1.80-hunspell.patch 1942 RMD160 1f216bad188d8bafca6cbc7aaa2c31e987833006 SHA1 49be4ba143f40919fe9509cafa77d02abfc381ae SHA256 cdf839246c4af288acbed132ea1f0c4ad1bd3d69b4ce575e51459143c359852c
 DIST texmaker-1.6.tar.bz2 853418 RMD160 ffa72545cab6bcec2974e081609260344ba84ef0 SHA1 8da3a6370214f97b568126439408a7774b017c1d SHA256 d49e7df506ef79e02a2382ad261760976f1e16cd5f42eea8308bb6710aaf832e
 DIST texmaker-1.7.1.tar.bz2 1522280 RMD160 37bca67d049fb064b45e09cfbb3453d4cb8bb8da SHA1 055aabf865e8d9baafe2762594469cd2b7d75183 SHA256 e814c68c20663792ca56ba3fb9600841e390463f96dac4f1ba034a35ec454a90
+DIST texmaker-1.8.tar.bz2 1767680 RMD160 b3bdfa7838f486f0969da472ff08c2d30825421e SHA1 d5f188c0d207c637a445cec984d79ee017de6e1a SHA256 1268f43a548c6c194ea848d5c70c429386b962f5685f16eb427267921f7ad944
 EBUILD texmaker-1.60.ebuild 1701 RMD160 1f85639059a3bfd0987c16e8e9bb2d426ff2d3a8 SHA1 aee8150ccc36602d48a9fbe3547c87a66c440e1e SHA256 89329666239452ad73b64cec94c446f1bab9736d9f24da4ef15fcdf2a0307a26
 EBUILD texmaker-1.71-r1.ebuild 1854 RMD160 cdb9c3b42bfa4bf785097f37da0adb5110bbaf50 SHA1 a9783726bc364849b88fa8224f967601bf97935f SHA256 1eb4f0d8533eb0db03c9eac41e25e01712a6139540959e2fdf02b4dedb4229e6
-MISC ChangeLog 7062 RMD160 b0addb91739f06f72871d5e2a4b1c2231c3f1b8e SHA1 a37ca6f6ccc05ca182f86c29e490b2a05fa4bf8d SHA256 749ce019d552350dd195a373096f9f04aff129f1960b88460739c1e63c7b0085
+EBUILD texmaker-1.80.ebuild 1858 RMD160 1515f4f99134d0a59e1ad3be0477e6fef80be23f SHA1 7dfc7a93af965b3b7860c64f2696fef1bcab7f33 SHA256 404feec3e0f189519fef1f09833a966f09a2495fc045bcff17fe60a29a91c3c4
+MISC ChangeLog 7237 RMD160 ca832c3430d9c8d9bf734e1875d43d9b43db0528 SHA1 c174555e7f5cf386d80e33e90b7508b14198a2ee SHA256 e7d70776c1e6ea3256e74279c0cf33f34b7ed096ffe3c54715fe3422e4174f99
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkvzu4ACgkQvFcC4BYPU0pXIQCdETHoJJX/70kFEUioPLMcCGPC
+eswAoKnMkVcNY7Wcrinhr/FbHTh/AERs
+=iqbI
+-----END PGP SIGNATURE-----
diff --git a/app-office/texmaker/files/texmaker-1.80-hunspell.patch b/app-office/texmaker/files/texmaker-1.80-hunspell.patch
new file mode 100644
index 000000000000..410e3beae534
--- /dev/null
+++ b/app-office/texmaker/files/texmaker-1.80-hunspell.patch
@@ -0,0 +1,74 @@
+Index: texmaker-1.8/spellerdialog.h
+===================================================================
+--- texmaker-1.8.orig/spellerdialog.h
++++ texmaker-1.8/spellerdialog.h
+@@ -13,7 +13,7 @@
+ 
+ #include "ui_spellerdialog.h"
+ #include "latexeditor.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ 
+ #include <QTextCursor>
+ 
+Index: texmaker-1.8/texmaker.pro
+===================================================================
+--- texmaker-1.8.orig/texmaker.pro
++++ texmaker-1.8/texmaker.pro
+@@ -2,7 +2,8 @@ TEMPLATE	= app
+ LANGUAGE	= C++
+ TARGET	 = texmaker
+ QT += network
+-CONFIG	+= qt warn_off release
++CONFIG	+= qt warn_off release link_pkgconfig
++PKGCONFIG = hunspell
+ ###############################
+ HEADERS	+= texmaker.h \
+ 	dsingleapplication.h \
+@@ -35,25 +36,7 @@ HEADERS	+= texmaker.h \
+ 	spellerdialog.h \
+ 	pstrickslistwidget.h \
+ 	blockdata.h \
+-	parenmatcher.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/w_char.hxx
++	parenmatcher.h
+ SOURCES	+= main.cpp \
+ 	dsingleapplication.cpp \
+ 	texmaker.cpp \
+@@ -85,18 +68,7 @@ SOURCES	+= main.cpp \
+ 	webpublishdialog.cpp \
+ 	spellerdialog.cpp \
+ 	pstrickslistwidget.cpp \
+-	parenmatcher.cpp \
+-	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/hunzip.cxx
++	parenmatcher.cpp
+ RESOURCES += texmaker.qrc
+ FORMS   += findwidget.ui\
+ 	gotolinedialog.ui \
diff --git a/app-office/texmaker/texmaker-1.80.ebuild b/app-office/texmaker/texmaker-1.80.ebuild
new file mode 100644
index 000000000000..c48cb86aa95a
--- /dev/null
+++ b/app-office/texmaker/texmaker-1.80.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-1.80.ebuild,v 1.1 2008/11/28 10:58:49 aballier Exp $
+
+EAPI=1
+
+inherit eutils versionator qt4
+
+DESCRIPTION="A nice LaTeX-IDE"
+
+# 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
+
+S="${WORKDIR}/${MY_P}"
+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 ~sparc ~x86 ~x86-fbsd"
+
+IUSE=""
+
+COMMON_DEPEND="x11-libs/libX11
+	x11-libs/libXext
+	|| ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 )
+	>=app-text/hunspell-1.2.4"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/latex-base
+	app-text/psutils
+	virtual/ghostscript
+	media-libs/netpbm"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-hunspell.patch"
+}
+
+src_compile() {
+	eqmake4 texmaker.pro || die "qmake failed"
+	emake || die "emake failed"
+}
+
+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"
+
+	make_desktop_entry texmaker Texmaker "/usr/share/pixmaps/texmaker/texmaker48x48.png" Office
+}
+
+pkg_postinst() {
+	elog "A user manual with many screenshots is available at:"
+	elog "/usr/share/${PN}/usermanual_en.html"
+	elog
+}