app-office/texstudio: Correct DESCRIPTION

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 22 insertions, 151 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/Manifest b/app-office/texstudio/Manifest
index e8ecf39aa582..7ce1eb9f6392 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -13,27 +13,24 @@ AUX texstudio-2.5-qtsingle.patch 597 SHA256 7b87dce38ed023feaa08cceabbba3c0b8e32
 AUX texstudio-2.5-viewers-use-xdg-open.patch 1311 SHA256 ee8a441cef57db995e3a1e8d3f8abd198c8689717b54bfaca5393bed3fc50790 SHA512 4e8084f7a0eaf75b8828bb6f3f2dbcc18f63c0d750f319347fc427af0ee2f858316c23f34aee396838dcff95610801b300e1a7941db747c1d2a6222a8e27ac81 WHIRLPOOL 93726ae1aed601e01a171f2995b4cd6dc7ece54d5c11456244fa9bc0cc0efb07999eba35fe102c4f2bb7570b2c0f247cdd8a146146358b82dd94f35dfd0f9213
 AUX texstudio-2.6.0-desktop.patch 699 SHA256 65c15ba516d444a51118839cc98abf66fc9f7fbe8a25760577ec0c645ae471c2 SHA512 91432aa75a61f17873e8358f60a1b10a4c7334c4b2d44f9b8b1b03abd64f728a856828b3c45e11d91380bf23dd4a62053fff4d2810ce64ac165741e213dda7c6 WHIRLPOOL b880b968eb8014f84802f578fe85bbddbc9ac25f5baddcdd72c7ff98bd20b4770cb1c7648cecb5066e9031fe8fb0cca4ca085a8a8b6db4ff33a38b490a9c99d6
 AUX texstudio-2.6.0-hunspell-quazip.patch 2545 SHA256 aff0970530a4761bd2c4d1d581b036955c9cc8ba9057a1ef3d017b3dd1685dbb SHA512 e04eccb4341769f61fdbba59244db0c42553ac0a889bde01a85b4596a9c0b4603121c26e048cb95c1f725ade0bbdfcb6c5b81b76b4ac553d676862298b26fc6a WHIRLPOOL 77fbe1899de42d2088ad63656c76cd2a9514457a0b897d1af6ed9bca5ae97d0e2c0fbce237b26d265515055cc41f0205698a9ebdce46966dcec706f01fa67cca
-DIST texstudio-2.5.2.tar.gz 20731701 SHA256 50cc2163b872590c0af8edd22f1795aaa424a821956c38db24e5d72ecdad4f08 SHA512 d85cb4375a6828bac17e9d0cf97158e54fcd492ddfbc5e632dec9ca52616b3a2fd83f9ec696285d2ebe8627b78b26fd2a37fc9f0d10c96f2ec87b0c6de1bd061 WHIRLPOOL 183ebf3f4b97917449ceea991288ddc1f4a8b6c383d5ed2592ba8de2a05048df2eae5b69a4e0f57db87ef661b7b8086ac9c4ec55bff13ab8236ee81a95d7c64c
 DIST texstudio-2.6.0.tar.gz 22913723 SHA256 23899dc7d57352f84deb375fefea33e3394f3fc497998abcdba003ef1856fc30 SHA512 e958c8e6bb73d3432cd54610c2ece3120c824c53c0fe2d367f2026fc3149bd837638f803706eacac44f48905032f39ad6792e3afbe721f6664a2b551dfdb47a2 WHIRLPOOL c16c4555ed63addb024b279589db09cd5d70f3af9940c4ae57394a04bc66b0be2bf22702bdba21342ed56be859db4b8943b832f6ec6d44ec96e6215bea2a0d93
-EBUILD texstudio-2.5.2-r1.ebuild 1541 SHA256 473672075ef8d216790675e21cfdbc3c06059fd7d23169aed419234a50384ec6 SHA512 85fc4f590e1a64feba6913ffc467ea6ec44a6bf7addbe6d2aafc885e209401418d6007b81cc28dc7b0ad7cc20e512f2071b139a347efdda82543e269bf7ce7f4 WHIRLPOOL a8c821379bff8ec7e4d59bcc4933400d800c7730845b8553749e9776dadd241b7a3abaf2cd8e5a22c47b7397178ee13da18787e0a1913ba06f70dc3418e580e5
-EBUILD texstudio-2.5.2.ebuild 1536 SHA256 e6513ea4e8b5a9a533df2b0e3a4aa9ee032c011e57687cc05a1e59c9be4d2004 SHA512 056fe7c90e16908adab59c7d2966f8811446e5ab466e5756cf0898cedd0c13147c549980c57d4bc16d62628b2f90d5dd675edfac1c7790c728384d0d37433f82 WHIRLPOOL d0e6f048b2ff68253a9b6f005e29768f3ceef5b952d366dad38709023f6ad87150bad9916d8c5d15b5a3f1f9ff777bf29c59070fb965230523049acead094afe
-EBUILD texstudio-2.6.0.ebuild 1590 SHA256 e0c6fe606f295cfd73b7524cb4bf5209d597325bff0276a267ccd691dca12ee9 SHA512 3db7ad3b8f12af82fd2c819c85a9f11dcf309710a5e6fa2ec01f2df2927cff1e153596c80fe98fc0ace0f8739e364799902dd6e349e733805f2991e1d8fd09ff WHIRLPOOL 50a07aa3a53bf100c9eb514738f9bd9173faac28ccf00bc2e4aef5e4703d37441e7100db79ad65f3b7bfd751ddf610c577f8db6c64d14d9d75f770088f1efe46
-MISC ChangeLog 3232 SHA256 5577026389184217f7443624da2c1b7e5454cdde2217af1ef21fa14def3b32e2 SHA512 183b2c8bd1fec29788d6c6d2eea482ef5ba0d112a5bd77467eefd1a58506585b34891c96a952d19c0c3242cb0375bb5777f997bf741959851514042b84d39105 WHIRLPOOL 176547887e0ac981cc6f505e51aa5900d7959a6791c42ef2c4ea53f5d8fcd807397f32bf6ba4b525fca572069dc6a0ab1b119220570ba47a6b92535bd22d78d4
+EBUILD texstudio-2.6.0.ebuild 1594 SHA256 cb022601e60a8c50fc795a509e95ef51e1618ea36835ee203ac65fe08f044b31 SHA512 7386b47da24aa8a0b4702c47876077eaa02acfe752800b76d7b57f5e06f51f542eda89d7f692b950204ec3a1e00aba4a344752e6b7c703814eb2c04cc2b2b4d5 WHIRLPOOL fe0dfcf5b8541fb1c59d15d40736e87999e7ba418eec058b1fca8538eba10d737671a3f9e2cfd496a7133cc9d5b9947ce79e1cea724e2726f07a1a3234a31288
+MISC ChangeLog 3382 SHA256 16a572a21ce18e1a4acc68ea8c5996bd2bbf254bc443b0bd7a26cc2749113694 SHA512 f70783dc10df2d07eeb3ee9d8c6da5711e3ddde96598e4137cb70e7f5ddda7da5e1c42d467bd16aaf09d72d5437692d71d31096b6e0afa21e622d26019b957a6 WHIRLPOOL 809fa8e332a8bea92a7de53fec0590cccf16c45052850300bf17abfdc2ecbc8728a8d248d2ac3a63e55503ccc249fa62f6714f6c7d4741df71615eeee25f1fc2
 MISC metadata.xml 283 SHA256 0c64e26ba93ec0d8dd149b088c63e4448174b2f843c91e1f74ac17c2a5feea27 SHA512 74ce72ee9b32eb81077907416c71890c37d20055481df15f0e056e083fe300701dabf6d8df11aa1ecbed13c1ea167305417050ca2e41f4e1b63e2a434f18c821 WHIRLPOOL ac0ac10f27910c9beb29ab731afbe9bce6c4811fb0a1f787036ae1b0638dbdb6ba2a744b3ad4ca6fa5a649a4a8be082969cbe99c8bcd0cdceea8252a5268df4d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR4Gm0AAoJELp701BxlEWf77AQAIp5a3wX0U90mSHhyccFTylt
-1bVDEJKPm6mLluUKw5/6c8VXD5mbXoiKFiPfSwdJBtjONuV2HHdPlZwoPJwtatMx
-dOgC0Icd+soxn95YJQUhPRG/G93Hi9AYXgC6aK+RgN5yqd7bEWVgp1kWlgp6mpCO
-/ma4WEatMgjFvgOa7kL4C6dNB0qN+pPbFCq2gfA4tFOuSs4s0UVmOmXAFeZze/AJ
-Ytn69aW+ccwY2Qizk2b+AUycDyrdbtd8+L+Su9/kxbF6mGrLVscUDVbMjhVv2Z9m
-UiHRK7I1xJ/QijbR25HQT+Ark3CR3LLDgyOki+wLSUtwXWM249vz34U+j0tlpPsV
-gWxeoKrCnN9642fIAgjflvIddo1J5oG5fLIr1NrMiTpcEhCeatORo2piIzek8zQu
-5N/+4d55wo6gtH1VIflb2ePcDkSxYyW4DL5Qw/4L104gnxmNm5XWZ2Bzmt8pe6Tz
-pHj4dG76iamdNMb+q/L9JUIDzUFihSVemxNldAd6OymgdMtNYM8vgzdQ8cki0cSG
-zlR7efqwqp1U1kGTbCHAliKNOJYybdVcb+lOBW7snlr9DPySealarzpZVlFxCoRs
-0LlTJZjqogbQFt2dnkqZAdgtCqKLD0o9iYyP58OYOgztl6ueNo5j8x/VSJnAAgXn
-bzjV46frqEbarjYa2bGZ
-=MQ3P
+iQIcBAEBCgAGBQJR4mFDAAoJELnU8jG9FVirRjAP/30aQhnCHYsBZm/7cDd/as+d
+OtfBxfMxX1U5k6jcd8vKjweEvOx5N7Ps9r2TbYKNuVqjGyGlTW/ExHPK3nv9jkF4
+lZAjrchsXxr91VDZ8By0xl9VrcceWXDghWgUe9AtjCz+Kk4xccdN0UIWgvF6QX+I
+DlHfKbyFKgXBu1LXppOCyD0yKVD96nkBevesWl0nAn+kCcYHgisa3wfph2TxOnFa
+NmzpuEx4nxwQ3SnYAq+IIqQHDOkC2aTPM3/28QfypkyMaREs+xnYGNbtkB5b/MrD
+8xQXikXRkRf0lowBng65GdsvmlDUjHCWG8t1OZF5UA+6nb0Nr+0axHnul01kWeZw
+JyX5W7guxysUPMR/5GZi/zBUrQXYnpfh4/3HWNW76mQbS79ioZzgY2JpIOm3kz34
+1oFA4IwPEVTFExAyShzeftDcznLV+Uvkmw4+9mCdZ13OXIUJ9ZvXYu8yF8Q858mY
+b4XeUXsekPgqIXFx5uTV2V96oPD3bdD+5xAwn8Ung+ZHt4La6zXGuSmBaJ0L0Uw8
+wF1bztjsi7AyV6+Ola9evnrxBG7GCFT0ilXYY3z/qnc5XxopE28v76EMFaRPbJb3
+FxniGw0JYdTWYnBX/nH6mmA97neLflIKUKIvqpzZzX+glLAM+ToNTe0+XiihjnzM
+Lu2vyvHL8LhfsdNNdeAR
+=yG1K
 -----END PGP SIGNATURE-----
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"