Bump to 1.30, solves qt-4.1 problems

Package-Manager: portage-2.1_pre4-r1

4 files changed, 28 insertions, 16 deletions

diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index f780aa14ecc4..3b26f19a9b99 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,6 +1,18 @@
 MD5 d3cdef3c09885dc032b9b4a16045945f ChangeLog 2550
+RMD160 987270cfd65565526bc3efbd048cea0d5640bda6 ChangeLog 2550
+SHA256 b84d5c184a74dd8b874a42dbad094bea3c9f25d64db8dac8a502eef3c937cff6 ChangeLog 2550
 MD5 6523b9d37f10392c4198cac68935cd93 files/digest-texmaker-1.11-r1 66
-MD5 87c6b930962d1f18ddef65c23a1ccd79 files/digest-texmaker-1.21 67
+RMD160 3b0375aa9f88c0de1a8e52baf4f7776fce9d127e files/digest-texmaker-1.11-r1 66
+SHA256 56d7a667e36c47cd66b4eeb5772685774096121e88db23b39c59d1128ce7b79e files/digest-texmaker-1.11-r1 66
+MD5 52e2db14f5ef56843cf0cae38457d70d files/digest-texmaker-1.30 241
+RMD160 3e22077ca542884a262480438be18edd06311ff9 files/digest-texmaker-1.30 241
+SHA256 e48cce7906daf884e80cdf156c6e398fd865b3b2926669e9fe192125aa48f48f files/digest-texmaker-1.30 241
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
+SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata.xml 164
 MD5 1d1f517862287be3621bd6d8d018938d texmaker-1.11-r1.ebuild 1574
-MD5 e4198d9ffdbc031830f3013bdf8d170f texmaker-1.21.ebuild 2061
+RMD160 6103b1c6640eade912b2d20a68d2bfc918c892cb texmaker-1.11-r1.ebuild 1574
+SHA256 6bd7187614a9a852f491141119ac3fb14cdd4c9d3f9682504ee55cfae4d52781 texmaker-1.11-r1.ebuild 1574
+MD5 4f5a046117a3d70c863512e7bcd54c93 texmaker-1.30.ebuild 1723
+RMD160 8f7f0951ccc9c53b1da3a88bb027937e274fc6c7 texmaker-1.30.ebuild 1723
+SHA256 0c6085ee790ec526f1ed367ce42b7eda72fe60531244290cb6cbd6db62df49de texmaker-1.30.ebuild 1723
diff --git a/app-office/texmaker/files/digest-texmaker-1.21 b/app-office/texmaker/files/digest-texmaker-1.21
deleted file mode 100644
index c6fa6d9e2955..000000000000
--- a/app-office/texmaker/files/digest-texmaker-1.21
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5c7386b89155e973d506ecc6319d129f texmaker-1.2.1.tar.bz2 774811
diff --git a/app-office/texmaker/files/digest-texmaker-1.30 b/app-office/texmaker/files/digest-texmaker-1.30
new file mode 100644
index 000000000000..351079e479e6
--- /dev/null
+++ b/app-office/texmaker/files/digest-texmaker-1.30
@@ -0,0 +1,3 @@
+MD5 63dd6ad9598656e647bed274516700c6 texmaker-1.3.tar.bz2 696467
+RMD160 c1b83ceacc7badf32ac416fa4ffc9a9d054f8a52 texmaker-1.3.tar.bz2 696467
+SHA256 5ff2b874c0a6d2b7f473761de2c8263d716cbb08f43930a0ba97c9dc11eb6caa texmaker-1.3.tar.bz2 696467
diff --git a/app-office/texmaker/texmaker-1.21.ebuild b/app-office/texmaker/texmaker-1.30.ebuild
index 83638c61e105..470656a9208d 100644
--- a/app-office/texmaker/texmaker-1.21.ebuild
+++ b/app-office/texmaker/texmaker-1.30.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-1.21.ebuild,v 1.5 2006/01/25 14:08:57 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-1.30.ebuild,v 1.1 2006/02/12 15:35:36 nattfodd Exp $
 
-inherit eutils versionator
+inherit eutils versionator qt4
 
 DESCRIPTION="a nice LaTeX-IDE"
 
@@ -11,7 +11,12 @@ DESCRIPTION="a nice LaTeX-IDE"
 MAJOR="$(get_major_version)"
 MINOR_1="$(($(get_version_component_range 2)/10))"
 MINOR_2="$(($(get_version_component_range 2)%10))"
-MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
+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"
@@ -29,12 +34,12 @@ RDEPEND="|| ( ( x11-libs/libX11
 			virtual/x11
 		)"
 
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	virtual/tetex
 	app-text/psutils
 	virtual/ghostscript
 	media-libs/netpbm
-	=x11-libs/qt-4.0*"
+	$(qt_min_version 4)"
 
 src_compile() {
 	cd ${S}
@@ -48,7 +53,7 @@ src_install() {
 	insinto /usr/share/pixmaps/texmaker
 	doins utilities/texmaker*.png || die "doins failed."
 
-	dodoc utilities/{AUTHORS,COPYING} || die "dodoc failed"
+	dodoc utilities/AUTHORS || die "dodoc failed"
 
 	dohtml utilities/*.{html,gif,css,txt} utilities/doc*.png || die "dohtml failed"
 
@@ -61,11 +66,4 @@ pkg_postinst() {
 	einfo "A user manual with many screenshots is available at:"
 	einfo "/usr/share/doc/${PF}/html/usermanual.html"
 	einfo ""
-	ewarn "texmaker-1.21 does not currently work with qt-4.1, only qt-4.0."
-	ewarn "Unfortunately, portage can not handle this correctly yet, so it is"
-	ewarn "possible that you obtain an infinite qt-4.0/qt-4.1 cycle in your emerge world."
-	ewarn ""
-	ewarn "If that happens, it is suggested to either mask qt-4.1"
-	ewarn "  (echo \">=x11-libs/qt-4.1\" >> /etc/portage/package.mask)"
-	ewarn "or downgrade texmaker."
 }