Fix compilation error and update of dep (>=qt-4.2.2) (bug #160465).

Package-Manager: portage-2.1.2-r7

4 files changed, 35 insertions, 20 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index 81710a9ce45e..b3f9c8e3e859 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/texmaker
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.26 2007/01/25 06:03:17 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.27 2007/02/08 13:47:46 nattfodd Exp $
+
+*texmaker-1.50-r1 (05 Feb 2007)
+
+  05 Feb 2007; Alexandre Buisse <nattfodd@gentoo.org> -texmaker-1.50.ebuild,
+  +texmaker-1.50-r1.ebuild:
+  Fix compilation error and update of dep (>=qt-4.2.2) (bug #160465).
 
   25 Jan 2007; Marius Mauch <genone@gentoo.org> texmaker-1.11-r1.ebuild,
   texmaker-1.30.ebuild, texmaker-1.40.ebuild, texmaker-1.50.ebuild:
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index 6b9e77894377..64031e36bb72 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -17,14 +17,14 @@ EBUILD texmaker-1.40.ebuild 1825 RMD160 43977415503f39ad55250e255c62dd0e07400ffa
 MD5 d1dcfeae8357b3c54f2a862cceab8164 texmaker-1.40.ebuild 1825
 RMD160 43977415503f39ad55250e255c62dd0e07400ffa texmaker-1.40.ebuild 1825
 SHA256 09594ea2c18de2280fce7e3fde157691f54a822735ed2c9a287f181afd0e80e0 texmaker-1.40.ebuild 1825
-EBUILD texmaker-1.50.ebuild 1748 RMD160 18a74be19772077b9a1ee8e92bbc384345884a2f SHA1 ba58476fb6e9a64237193b57f132c014134608f2 SHA256 71a4f20b1b7a850368bff0afedb984c1243cb2c775f2ea066490c1fc33167527
-MD5 e53186d4ce473a559a9ff009aa35dc63 texmaker-1.50.ebuild 1748
-RMD160 18a74be19772077b9a1ee8e92bbc384345884a2f texmaker-1.50.ebuild 1748
-SHA256 71a4f20b1b7a850368bff0afedb984c1243cb2c775f2ea066490c1fc33167527 texmaker-1.50.ebuild 1748
-MISC ChangeLog 3745 RMD160 fee77c162e0801173e15237247092d88ac33f282 SHA1 97a3992775194f20167093c024e5a600b0438efa SHA256 323a8b9f0476b5a7b943bc38f871622e218c54afae7f619ba8cac9c62a5792a6
-MD5 3eb63bc909f1fbc5c040a28cd5a11fc7 ChangeLog 3745
-RMD160 fee77c162e0801173e15237247092d88ac33f282 ChangeLog 3745
-SHA256 323a8b9f0476b5a7b943bc38f871622e218c54afae7f619ba8cac9c62a5792a6 ChangeLog 3745
+EBUILD texmaker-1.50-r1.ebuild 2031 RMD160 9bd0b4c84d75cb096c5597f102defa4994298b74 SHA1 95b24369a9414523828b5f68315dc550746b96fb SHA256 d8cb282cded30cf7d0889b6fef29fae48695065067eb4d423a654d3ef55497f3
+MD5 78c1f7f1429d4870b041f0dcf4aa322f texmaker-1.50-r1.ebuild 2031
+RMD160 9bd0b4c84d75cb096c5597f102defa4994298b74 texmaker-1.50-r1.ebuild 2031
+SHA256 d8cb282cded30cf7d0889b6fef29fae48695065067eb4d423a654d3ef55497f3 texmaker-1.50-r1.ebuild 2031
+MISC ChangeLog 3956 RMD160 5c857ec478c5879451371a89b90fefbb3f4ad448 SHA1 6e347b1a0a20a5c8c1c19782b5c390cf1f5f8ec4 SHA256 431eb177caf8a4909e45303a92bb516ca84daf1d0fcfed14b52720860fa1df85
+MD5 eb5c1939a0cc84adb13629670b13ce16 ChangeLog 3956
+RMD160 5c857ec478c5879451371a89b90fefbb3f4ad448 ChangeLog 3956
+SHA256 431eb177caf8a4909e45303a92bb516ca84daf1d0fcfed14b52720860fa1df85 ChangeLog 3956
 MISC metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b SHA1 a805613d38e6e3bff93cba3858d6a92cc79fe2f7 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
@@ -38,13 +38,13 @@ SHA256 e48cce7906daf884e80cdf156c6e398fd865b3b2926669e9fe192125aa48f48f files/di
 MD5 69315916b6ba81c4c6fcd7035b20ee21 files/digest-texmaker-1.40 241
 RMD160 7aeb6653e8df360d6fbb434283649014c0be65e6 files/digest-texmaker-1.40 241
 SHA256 c649aabf89be10c561da77246042971930d1cbbe90a66666e29b9e78a911dad9 files/digest-texmaker-1.40 241
-MD5 6e7164283ac59481659ba1b6e0ade0a6 files/digest-texmaker-1.50 241
-RMD160 d27cfb3c5a3448df62b9b4b9a8da11971a57d86e files/digest-texmaker-1.50 241
-SHA256 4d289e1c6c8fcd8e39b28df370844b676bb6c9fc906918f91af2684837798891 files/digest-texmaker-1.50 241
+MD5 6e7164283ac59481659ba1b6e0ade0a6 files/digest-texmaker-1.50-r1 241
+RMD160 d27cfb3c5a3448df62b9b4b9a8da11971a57d86e files/digest-texmaker-1.50-r1 241
+SHA256 4d289e1c6c8fcd8e39b28df370844b676bb6c9fc906918f91af2684837798891 files/digest-texmaker-1.50-r1 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFuErX6J2i8a8J4okRAvDXAJkBjYM3RQhWHvOnvMFXe9EXPX7O+QCg3LaM
-A1EKuXFfKoS6Ckpyb/XnB5g=
-=xJbA
+iD8DBQFFyyoVwx9vvAARv2sRAsXLAJ4qj+r2kRJjfUM397cNT0UdJ/OiMwCg09Gg
+O4nsoSrswCypOinJG7vFFbk=
+=F+QU
 -----END PGP SIGNATURE-----
diff --git a/app-office/texmaker/files/digest-texmaker-1.50 b/app-office/texmaker/files/digest-texmaker-1.50-r1
index 513b98a97597..513b98a97597 100644
--- a/app-office/texmaker/files/digest-texmaker-1.50
+++ b/app-office/texmaker/files/digest-texmaker-1.50-r1
diff --git a/app-office/texmaker/texmaker-1.50.ebuild b/app-office/texmaker/texmaker-1.50-r1.ebuild
index 1fcd72f32f7a..9ac42bdf8ca1 100644
--- a/app-office/texmaker/texmaker-1.50.ebuild
+++ b/app-office/texmaker/texmaker-1.50-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-1.50.ebuild,v 1.2 2007/01/25 06:03:17 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-1.50-r1.ebuild,v 1.1 2007/02/08 13:47:46 nattfodd Exp $
 
 inherit eutils versionator qt4
 
-DESCRIPTION="a nice LaTeX-IDE"
+DESCRIPTION="A nice LaTeX-IDE"
 
 # The upstream version numbering is bad, so we have to remove a dot in the
 # minor version number
@@ -34,7 +34,7 @@ DEPEND="|| ( ( x11-libs/libX11
 			virtual/x11
 		)
 		app-text/aspell
-		$(qt4_min_version 4.1.4)"
+		>=x11-libs/qt-4.2.2"
 
 RDEPEND="${DEPEND}
 	virtual/tetex
@@ -44,7 +44,14 @@ RDEPEND="${DEPEND}
 
 src_compile() {
 	cd ${S}
-	qmake -unix texmaker.pro || die "qmake failed"
+	if use x86-fbsd; then
+		myspec="-spec freebsd-g++ -unix"
+	else
+		myspec="-spec linux-g++ -unix"
+	fi
+	qmake PREFIX="/usr" QMAKE_CFLAGS="${CFLAGS}" \
+		QMAKE_CXXFLAGS="${CXXFLAGS}" ${myspec} \
+		texmaker.pro || die "qmake failed"
 	emake || die "emake failed"
 }
 
@@ -53,8 +60,10 @@ src_install() {
 
 	insinto /usr/share/pixmaps/texmaker
 	doins utilities/texmaker*.png || die "doins failed."
+	doins utilities/texmaker.svg || die "doins failed."
 
 	dodoc utilities/AUTHORS || die "dodoc failed"
+	dodoc utilities/CHANGELOG || die "dodoc failed"
 
 	dohtml utilities/*.{html,gif,css,txt} utilities/doc*.png || die "dohtml failed"