app-office/texmaker: Version Bump, #497266; drop old

(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

5 files changed, 14 insertions, 205 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index 4c65511650bd..3bda4119b476 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,13 @@
 # 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.137 2013/11/03 10:51:38 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.138 2014/01/06 13:52:21 jlec Exp $
+
+*texmaker-4.1.1 (06 Jan 2014)
+
+  06 Jan 2014; Justin Lecher <jlec@gentoo.org> -texmaker-4.0.2.ebuild,
+  -texmaker-4.0.3.ebuild, -texmaker-4.0.4.ebuild, -texmaker-4.0.4-r1.ebuild,
+  +texmaker-4.1.1.ebuild:
+  Version Bump, #497266; drop old
 
 *texmaker-4.1 (03 Nov 2013)
 
diff --git a/app-office/texmaker/texmaker-4.0.2.ebuild b/app-office/texmaker/texmaker-4.0.2.ebuild
deleted file mode 100644
index 87bd4c3d574a..000000000000
--- a/app-office/texmaker/texmaker-4.0.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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-4.0.2.ebuild,v 1.1 2013/05/11 12:27:28 jlec Exp $
-
-EAPI=5
-
-inherit 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
-	dev-qt/qtgui:4
-	dev-qt/qtcore:4
-	dev-qt/qtwebkit:4
-"
-RDEPEND="${COMMON_DEPEND}
-	virtual/latex-base
-	app-text/psutils
-	app-text/ghostscript-gpl
-	media-libs/netpbm"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.0.1-hunspell.patch )
-
-DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt thanks.txt )
-
-src_configure() {
-	eqmake4 \
-		${PN}.pro \
-		PREFIX="${EPREFIX}/usr" \
-		DESKTOPDIR="${EPREFIX}/usr/share/applications" \
-		ICONDIR="${EPREFIX}/usr/share/pixmaps"
-}
-
-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-4.0.3.ebuild b/app-office/texmaker/texmaker-4.0.3.ebuild
deleted file mode 100644
index 0a1ce868a63f..000000000000
--- a/app-office/texmaker/texmaker-4.0.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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-4.0.3.ebuild,v 1.1 2013/07/29 12:54:54 jlec Exp $
-
-EAPI=5
-
-inherit 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
-	dev-qt/qtgui:4
-	dev-qt/qtcore:4
-	dev-qt/qtwebkit: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 )
-
-DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
-HTML_DOCS=( doc/. )
-
-src_configure() {
-	eqmake4 \
-		${PN}.pro \
-		PREFIX="${EPREFIX}/usr" \
-		DESKTOPDIR="${EPREFIX}/usr/share/applications" \
-		ICONDIR="${EPREFIX}/usr/share/pixmaps"
-}
-
-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-4.0.4.ebuild b/app-office/texmaker/texmaker-4.0.4.ebuild
deleted file mode 100644
index 15eb6fbbe638..000000000000
--- a/app-office/texmaker/texmaker-4.0.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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-4.0.4.ebuild,v 1.1 2013/09/17 16:19:06 jlec Exp $
-
-EAPI=5
-
-inherit 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
-	dev-qt/qtgui:4
-	dev-qt/qtcore:4
-	dev-qt/qtwebkit:4
-"
-RDEPEND="${COMMON_DEPEND}
-	virtual/latex-base
-	app-text/psutils
-	app-text/ghostscript-gpl
-	media-libs/netpbm"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.0.3-hunspell.patch )
-
-DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
-HTML_DOCS=( doc/. )
-
-src_configure() {
-	eqmake4 \
-		${PN}.pro \
-		PREFIX="${EPREFIX}/usr" \
-		DESKTOPDIR="${EPREFIX}/usr/share/applications" \
-		ICONDIR="${EPREFIX}/usr/share/pixmaps"
-}
-
-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-4.0.4-r1.ebuild b/app-office/texmaker/texmaker-4.1.1.ebuild
index 2aa691180f48..13115123aed7 100644
--- a/app-office/texmaker/texmaker-4.0.4-r1.ebuild
+++ b/app-office/texmaker/texmaker-4.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.0.4-r1.ebuild,v 1.1 2013/10/26 09:47:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.1.1.ebuild,v 1.1 2014/01/06 13:52:21 jlec Exp $
 
 EAPI=5
 
@@ -43,13 +43,14 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
 	virtual/latex-base
+	app-i18n/ibus-qt
 	app-text/psutils
 	app-text/ghostscript-gpl
 	media-libs/netpbm"
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${P}-unbundle.patch )
+PATCHES=( "${FILESDIR}"/${PN}-4.1-unbundle.patch )
 
 DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
 HTML_DOCS=( doc/. )
@@ -62,6 +63,7 @@ src_prepare() {
 	cat >> ${PN}.pro <<- EOF
 	exists(texmakerx_my.pri):include(texmakerx_my.pri)
 	EOF
+
 	cp "${FILESDIR}"/texmakerx_my.pri . || die
 
 	sed \