app-office/texstudio: Correct DESCRIPTION

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

4 files changed, 7 insertions, 133 deletions

diff --git a/app-office/texstudio/ChangeLog b/app-office/texstudio/ChangeLog
index 95ffe72a29b0..8b8932b62bdf 100644
--- a/app-office/texstudio/ChangeLog
+++ b/app-office/texstudio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/texstudio
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/ChangeLog,v 1.14 2013/07/12 20:39:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/ChangeLog,v 1.15 2013/07/14 08:28:47 jlec Exp $
+
+  14 Jul 2013; Justin Lecher <jlec@gentoo.org> -texstudio-2.5.2.ebuild,
+  -texstudio-2.5.2-r1.ebuild, texstudio-2.6.0.ebuild:
+  Correct DESCRIPTION
 
   12 Jul 2013; Agostino Sarubbo <ago@gentoo.org> texstudio-2.6.0.ebuild:
   Stable for amd64, wrt bug #476558
diff --git a/app-office/texstudio/texstudio-2.5.2-r1.ebuild b/app-office/texstudio/texstudio-2.5.2-r1.ebuild
deleted file mode 100644
index fb979c1fd10a..000000000000
--- a/app-office/texstudio/texstudio-2.5.2-r1.ebuild
+++ /dev/null
@@ -1,65 +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/texstudio/texstudio-2.5.2-r1.ebuild,v 1.2 2013/04/25 06:35:59 jlec Exp $
-
-EAPI=5
-
-inherit base fdo-mime qt4-r2
-
-DESCRIPTION="Free cross-platform LaTeX editor (former texmakerX)"
-HOMEPAGE="http://texstudio.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/TeXstudio%20${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="video"
-
-COMMON_DEPEND="
-	app-text/hunspell
-	app-text/poppler:=[qt4]
-	x11-libs/libX11
-	x11-libs/libXext
-	>=dev-qt/qtgui-4.6.1:4
-	>=dev-qt/qtcore-4.6.1:4
-	>=dev-qt/qtscript-4.6.1:4
-	>=dev-qt/qttest-4.6.1:4
-	video? ( media-libs/phonon )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/latex-base
-	app-text/psutils
-	app-text/ghostscript-gpl
-	media-libs/netpbm"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/-/}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5-hunspell.patch
-# 441914
-#	"${FILESDIR}"/${P}-qtsingle.patch
-	"${FILESDIR}"/${PN}-2.4-desktop.patch
-# Get it from fedora
-	"${FILESDIR}"/${PN}-2.5-viewers-use-xdg-open.patch
-	)
-
-src_prepare() {
-	find hunspell utilities/poppler-data -delete || die
-	if use video; then
-		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
-	fi
-	qt4-r2_src_prepare
-}
-
-src_install() {
-	for i in 16x16 22x22 32x32 48x48 64x64; do
-		insinto /usr/share/icons/hicolor/${i}
-		newins utilities/${PN}${i}.png ${PN}.png
-	done
-	qt4-r2_src_install
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-office/texstudio/texstudio-2.5.2.ebuild b/app-office/texstudio/texstudio-2.5.2.ebuild
deleted file mode 100644
index a1435a92d8db..000000000000
--- a/app-office/texstudio/texstudio-2.5.2.ebuild
+++ /dev/null
@@ -1,65 +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/texstudio/texstudio-2.5.2.ebuild,v 1.3 2013/04/25 06:35:59 jlec Exp $
-
-EAPI=4
-
-inherit base fdo-mime qt4-r2
-
-DESCRIPTION="Free cross-platform LaTeX editor (former texmakerX)"
-HOMEPAGE="http://texstudio.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/TeXstudio%20${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="video"
-
-COMMON_DEPEND="
-	app-text/hunspell
-	app-text/poppler[qt4]
-	x11-libs/libX11
-	x11-libs/libXext
-	>=dev-qt/qtgui-4.6.1:4
-	>=dev-qt/qtcore-4.6.1:4
-	>=dev-qt/qtscript-4.6.1:4
-	>=dev-qt/qttest-4.6.1:4
-	video? ( media-libs/phonon )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/latex-base
-	app-text/psutils
-	app-text/ghostscript-gpl
-	media-libs/netpbm"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/-/}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5-hunspell.patch
-# 441914
-#	"${FILESDIR}"/${P}-qtsingle.patch
-	"${FILESDIR}"/${PN}-2.4-desktop.patch
-# Get it from fedora
-	"${FILESDIR}"/${PN}-2.5-viewers-use-xdg-open.patch
-	)
-
-src_prepare() {
-	find hunspell utilities/poppler-data -delete || die
-	if use video; then
-		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
-	fi
-	qt4-r2_src_prepare
-}
-
-src_install() {
-	for i in 16x16 22x22 32x32 48x48 64x64; do
-		insinto /usr/share/icons/hicolor/${i}
-		newins utilities/${PN}${i}.png ${PN}.png
-	done
-	qt4-r2_src_install
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-office/texstudio/texstudio-2.6.0.ebuild b/app-office/texstudio/texstudio-2.6.0.ebuild
index 41a5fd57bbe9..fe7ec4546423 100644
--- a/app-office/texstudio/texstudio-2.6.0.ebuild
+++ b/app-office/texstudio/texstudio-2.6.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.6.0.ebuild,v 1.2 2013/07/12 20:39:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.6.0.ebuild,v 1.3 2013/07/14 08:28:47 jlec Exp $
 
 EAPI=5
 
 inherit base fdo-mime qt4-r2
 
-DESCRIPTION="Free cross-platform LaTeX editor (former texmakerX)"
+DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
 HOMEPAGE="http://texstudio.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}/TeXstudio%20${PV}/${P}.tar.gz"