app-office/texmaker: Correct myspell dir path

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 126 insertions, 10 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index aa6bbfe81bfe..5ebbf3becebf 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/texmaker
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.116 2013/01/12 18:55:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.117 2013/01/29 18:44:41 jlec Exp $
+
+*texmaker-3.5.2-r1 (29 Jan 2013)
+
+  29 Jan 2013; Justin Lecher <jlec@gentoo.org> texmaker-3.5.2.ebuild,
+  +texmaker-3.5.2-r1.ebuild, files/texmaker-3.5.2-hunspell.patch:
+  Correct myspell dir path
 
   12 Jan 2013; Justin Lecher <jlec@gentoo.org> texmaker-3.5.2.ebuild,
   +files/texmaker-3.5.2-clang.patch:
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index d480c312ca30..e03850c39774 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -7,17 +7,18 @@ AUX texmaker-3.3.4-hunspell.patch 4478 SHA256 4d3b6dbbe829140e224bfa0cdceefef29c
 AUX texmaker-3.5-hunspell.patch 3841 SHA256 c886be8ca7c624ee0b61f57e4d23404882a4b142e6b7b3b02262c42829aef069 SHA512 fed81729a3e0a61caa4417aa28d39ffced6e5a728715760725d7bec8c9a8848bf56c0f82c160cfa20ccf10294d88e91c4a60589b695c549273620b419ee13960 WHIRLPOOL 5a048ea581184a84af1cf31858590940e5f799ae136578376e4ceb74e82d12b4238c62b0bada4ed1a42d56b9fcee0435c2a617c70bb47fa2f54f4d151f238501
 AUX texmaker-3.5.1-hunspell.patch 3843 SHA256 5bbd61ba62d87797230887afc3e6f618b90ae38009fd3c44eefba16b53fea1f3 SHA512 18efa8484ce05e3809fcc45f3b8a2c0ab83faaacc010c7beeb4069c68c67d24acba0ab5a0bea2896538f5b81e02c1d303fc4a3f679b8f611a51be7203e37cf94 WHIRLPOOL ef0c32261cc214a6efc9c7cd4eac1a23569a9d2d097a32eaaeaf6512771cb110b3248939a9c5bd84eb39889925d37aa527d2a16cdf959b286e78c67bc8bb3711
 AUX texmaker-3.5.2-clang.patch 771 SHA256 3aece614446a324270a8c9e05ca0830d4a0686f43f3fd94b033d0ecace62b946 SHA512 1043085f81338981ac931d34f0b1d5cb96c6bcbd0df4a8e2a8d46636514ffa0df8dec8623fd106867cffae161a099b45facc11778a2ec054031cbd7a75794266 WHIRLPOOL 32fc27128d8c7b5ee35953395e253a782be96b87fe60dd19141162a85fefae82659f7b39a5ff7b313e80822a441df8c15f2d5b0b5e9397329e5305dec449d632
-AUX texmaker-3.5.2-hunspell.patch 3738 SHA256 2cef3ac9d72e53de3b93df1bd5e70bb65186d49c7f7f86d98d507060b7eee348 SHA512 82c403244b1a552b624a6b79a0536030c06d9b41bcf88a1a3e050b90708ae1b79078424950a50c6a48986173c08597baaaf533f9853f70d18a9ae726d1b252b9 WHIRLPOOL 1b185c4c70b72bdc45e874cd6adb87ae218a56c25ffcb6e458a9bcd8a802c106d9570f1b85a5ecaed29aaaad7faa069e184a1aee96c68b0d74d47dff44e12fa0
+AUX texmaker-3.5.2-hunspell.patch 4791 SHA256 5f872ffd7d6cab80269c969bbf5875400be0e9df6fb1086f0634299ec0d77a9c SHA512 e1f2460dfbd42bb028980fa58d7482b49a554fe88204985c56a851a850e2d5249b66f034cdc2314b75f9a370920c74e08c260ecfccfc7ee0c10fe608581019e1 WHIRLPOOL fc4d5c4678f3cd9cf894ca552b4b98ae70c1f52e9e50ff77b8114d58c247216252e24c6660d28ae345e018fe3583fdc38aa39facf167756361f5f29308ab302e
 DIST texmaker-3.3.4.tar.bz2 13028203 SHA256 db9aa4d2633e6ad96ff4b0d893205d42c2220928f021c210146a41ecf87525f5 SHA512 014bfbe2a72aa2aef8d71972526959116a8dc39852475ea8e9da0d0fbbc4e8441c04b124be93911a0b637436f94ecab730150064f2bb3842e6566cd26116c28e WHIRLPOOL fb0a5d150ac463905b0c243e4402858e0142c42f1278f185e678e48a690369830a75848b342f0f22c3db6495580ee03eb65cbcf989bad52b63f87371d660970d
 DIST texmaker-3.5.2.tar.bz2 13165580 SHA256 5ffc96d64befa07656ee82e4f3cfc95a84d73759607d0229e864899d7629f312 SHA512 e81d553938102ec895641fbda364a5ad3d0cd09ddf0a0c3cc6c9034da67477711c01bcd13ca0b4daad78030513b5a2957dee021646efd4b9f2a22b9aea0fbe5b WHIRLPOOL 19ee0b138579f759f7eac29fe1976d5e8354c30719c4f0d29941f5d0aad41d29b4010c7eba77461f2051554dc05415feeead02d0d41637aa14bf757416293954
 EBUILD texmaker-3.3.4.ebuild 1690 SHA256 1d9ffb7f5822cdcc885d8a5b2db49d2c508f5119f7cf08370bba054ccc60e078 SHA512 94e8582b11e33a1181fffff672d8e40283d61bbcde3463dd5deff01ab7ec49b02ad5c440ef633422341e5c393acc387047bf66673d96dc53ed736c1ab3b9d213 WHIRLPOOL 8b991152408cc6ae05357e5a3d2703ced200273f26b48129d0675232dc478d3d71d405abab0276cff5fed18b32f72801eaed4f708218878b7524efe6443efb73
-EBUILD texmaker-3.5.2.ebuild 1719 SHA256 41e7bc98a02a908b4a6c8227cf172fbed00355c945442aaec97d86d832329b68 SHA512 b8e37daa41a92bd5e8cf58bdf35846dd015ff603d4f240bb538aff0ef71870d4b5f575907fa14d3f490d5c68a918a34f8bc20ce4afae5fc6dc7fb3bd54d3a9eb WHIRLPOOL 646e496054ddcd213f329c3e0aadc9ed334d07639c48ff64e3a2d8304c0269555d772b6cfe664ee5797567e0bbd80cd0841421d2af3f71d6a21ddaa9530845ac
-MISC ChangeLog 17714 SHA256 2f7a6a95a6a944120946d9a6feca00f2db3d93827e1b5982836aff9629e4d8d0 SHA512 dd178eb9a72a35b20eddcd09bb08598002ab7bd9b4f56c03dd0f972f9151c8e2806277e7a810c915c20609b7382a863e2e9985b9b7a7bef19ed4260766d5c91c WHIRLPOOL 7a12b68aea1ed6141f5f01369056f884f15ad9b3f0d386ae634091809511e350b0e715cb753b20bb6e9ac73bdadaa1eb7a8b6912461307c25e3ccb5eb16d2f2f
+EBUILD texmaker-3.5.2-r1.ebuild 1734 SHA256 2fa0881da36e846826b8d74ba3767e158791ec476c5ba4ea0edfdab751b201d3 SHA512 7a8f9e133634daa0684f22033c26d72eb8c399f5a3b3d330d1ae55b2b70a0a54112631df8596580e74ccbfae9f9caac53d7637cc7bef2c3d5856afe7a73de0a7 WHIRLPOOL 15d57991a60c69246bfa03d95c549356e13ed7fa4d8ed1436fead2acbc549aa8dba0431d5db452c0b5cf3ffb7c8c95c9d18c8f699083293fa37bd4891cd80629
+EBUILD texmaker-3.5.2.ebuild 1731 SHA256 fedb5ded7a7164acf795618f4b2c1cfcc6195218330b0f8a1966386afddd158c SHA512 11e7558b94ea8f0f312c6f1036942ceee1942131376f8eb0dce5ee6b80f7990e6befe20bbdbcdd05202cb191774ae71551275ef0952052ff497c87dd28abca04 WHIRLPOOL 7fbee18f74b7d5adcd32d1fc4f1f6caaa1df6e3506c245c8f4e28446558415f9eaa85d86797b00ee014da3c059c41f7e547ba89b3fe99cb61f6951b288867a01
+MISC ChangeLog 17912 SHA256 f366e4a79fa5c45ac94fc99f3fb769daccd25969979ae79bdf1e381a22751025 SHA512 41a99df58d0bac13b539a7fed88defe674618ceb9b6db52903425a903639b0dfa2bea515559bd74245e60421a7e72f8363cc88754de0dd07d2d589fa4eb55830 WHIRLPOOL 8ec4e3dcd196c25f362bae4bfff9970abe2580fe9bf799eac010ddcf3b6c25ff11f64a9f05299eb726ed76ebdd44ce2869088f5b94756e5c339f713a9eb83c59
 MISC metadata.xml 281 SHA256 2c7a572c26bbf24b0de55efe3ef0be56a2d9280869ffb4647791ce66f78a01bf SHA512 793f7f982c959f54c1af0f96a433837d031cf619190e57d784a5bb1f05503de72bf59329774c9efde5bf52c286eacd8032b366e1cc0ebaba94e110c326faa93d WHIRLPOOL f5324da1385ba50007e7f01f5d34f767f1cebefec780de74ade5c980c4d05e7e36590c6a8d79f5608201831daa6597e4a679b4e6a4e4ac33c2e09d94e554f5a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlDxsaMACgkQgAnW8HDreRYMyACcCZVoOXv5joK9AZ57L71MnwoS
-NKQAoLGxJvOfs9EftBIHfJcGfbYFOz9D
-=Kop4
+iEYEAREKAAYFAlEIGKUACgkQgAnW8HDreRZ+BgCfUlbA1KTG1OXhbV17gkPRFi/c
+2DkAn0XuX6PLsure2PsFUjlgiXZhpqpH
+=GO4a
 -----END PGP SIGNATURE-----
diff --git a/app-office/texmaker/files/texmaker-3.5.2-hunspell.patch b/app-office/texmaker/files/texmaker-3.5.2-hunspell.patch
index b7f094d9cd34..295f7e342bc2 100644
--- a/app-office/texmaker/files/texmaker-3.5.2-hunspell.patch
+++ b/app-office/texmaker/files/texmaker-3.5.2-hunspell.patch
@@ -1,11 +1,26 @@
+ configdialog.cpp   |  2 +-
  latexeditor.h      |  2 +-
  latexeditorview.h  |  2 +-
  latexhighlighter.h |  2 +-
  spellerdialog.h    |  2 +-
+ texmaker.cpp       |  4 ++--
  texmaker.h         |  2 +-
  texmaker.pro       | 40 +++++-----------------------------------
- 6 files changed, 10 insertions(+), 40 deletions(-)
+ 8 files changed, 13 insertions(+), 43 deletions(-)
 
+diff --git a/configdialog.cpp b/configdialog.cpp
+index c2354d3..dea2bc1 100644
+--- a/configdialog.cpp
++++ b/configdialog.cpp
+@@ -211,7 +211,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 1ad4195..8f43b61 100644
 --- a/latexeditor.h
@@ -58,6 +73,26 @@ index 83248ae..cd16dad 100644
  
  #include <QTextCursor>
  
+diff --git a/texmaker.cpp b/texmaker.cpp
+index 6e8f41b..c94d76a 100644
+--- a/texmaker.cpp
++++ b/texmaker.cpp
+@@ -4302,7 +4302,7 @@ geometry_options=config->value("Quick/GeometryOptions","left=2cm,right=2cm,top=2
+ QString dicDir=QCoreApplication::applicationDirPath() + "/";
+ #else
+ #ifdef DEBIAN_SPELLDIR
+-QString dicDir=PREFIX"/share/myspell/dicts/";
++QString dicDir=PREFIX"/share/myspell/";
+ #else
+ QString dicDir=PREFIX"/share/texmaker/";
+ #endif
+@@ -10747,4 +10747,4 @@ if (singlemode && currentEditorView())
+ 	    UpdateBibliography();
+ 	    }
+ 	}
+-}
+\ No newline at end of file
++}
 diff --git a/texmaker.h b/texmaker.h
 index 3b7135e..5713b5a 100644
 --- a/texmaker.h
diff --git a/app-office/texmaker/texmaker-3.5.2-r1.ebuild b/app-office/texmaker/texmaker-3.5.2-r1.ebuild
new file mode 100644
index 000000000000..589839db56b3
--- /dev/null
+++ b/app-office/texmaker/texmaker-3.5.2-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2013 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-r1.ebuild,v 1.1 2013/01/29 18:44:41 jlec Exp $
+
+EAPI=4
+
+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
+
+MY_P="${P}"
+
+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 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+	app-text/hunspell
+	app-text/poppler[qt4]
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/qt-gui:4
+	x11-libs/qt-core:4
+	x11-libs/qt-webkit:4
+"
+RDEPEND="${COMMON_DEPEND}
+	virtual/latex-base
+	app-text/psutils
+	app-text/ghostscript-gpl
+	media-libs/netpbm"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-hunspell.patch
+	"${FILESDIR}"/${P}-clang.patch
+	)
+src_configure() {
+	eqmake4 \
+		${PN}.pro \
+		PREFIX="${EPREFIX}"/usr \
+		DESKTOPDIR=/usr/share/applications \
+		ICONDIR=/usr/share/pixmaps
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}" install
+
+	doicon utilities/texmaker*.png utilities/texmaker.svg
+
+	dodoc utilities/AUTHORS utilities/CHANGELOG.txt
+}
+
+pkg_postinst() {
+	elog "A user manual with many screenshots is available at:"
+	elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
+}
diff --git a/app-office/texmaker/texmaker-3.5.2.ebuild b/app-office/texmaker/texmaker-3.5.2.ebuild
index 1e9c0eead1de..f50ef92e5bfc 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-2013 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.3 2013/01/12 18:55:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.5.2.ebuild,v 1.4 2013/01/29 18:44:41 jlec Exp $
 
 EAPI=4
 
@@ -55,7 +55,7 @@ PATCHES=(
 src_configure() {
 	eqmake4 \
 		${PN}.pro \
-		PREFIX=/usr \
+		PREFIX="${EPREFIX}"/usr \
 		DESKTOPDIR=/usr/share/applications \
 		ICONDIR=/usr/share/pixmaps
 }