app-office/texstudio: Add subslot operator for app-text/poppler, #462020

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

4 files changed, 13 insertions, 138 deletions

diff --git a/app-office/texstudio/ChangeLog b/app-office/texstudio/ChangeLog
index 3efb1d74a159..56435c427597 100644
--- a/app-office/texstudio/ChangeLog
+++ b/app-office/texstudio/ChangeLog
@@ -1,6 +1,12 @@
 # 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.10 2013/03/02 19:38:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/ChangeLog,v 1.11 2013/03/17 12:27:57 jlec Exp $
+
+*texstudio-2.5.2-r1 (17 Mar 2013)
+
+  17 Mar 2013; Justin Lecher <jlec@gentoo.org> -texstudio-2.3-r1.ebuild,
+  -texstudio-2.4.ebuild, -texstudio-2.5.ebuild, +texstudio-2.5.2-r1.ebuild:
+  Add subslot operator for app-text/poppler, #462020
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> texstudio-2.3-r1.ebuild,
   texstudio-2.4.ebuild, texstudio-2.5.2.ebuild, texstudio-2.5.ebuild:
diff --git a/app-office/texstudio/texstudio-2.3-r1.ebuild b/app-office/texstudio/texstudio-2.3-r1.ebuild
deleted file mode 100644
index 907ab0d266d0..000000000000
--- a/app-office/texstudio/texstudio-2.3-r1.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/texstudio/texstudio-2.3-r1.ebuild,v 1.3 2013/03/02 19:38:36 hwoarang 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
-	>=dev-qt/qtwebkit-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}"/${P}-hunspell.patch
-	"${FILESDIR}"/${P}-gcc47.patch
-	"${FILESDIR}"/${P}-test.patch
-	"${FILESDIR}"/${P}-xdg-open.patch
-	)
-
-src_prepare() {
-	find hunspell -delete
-	sed 's:hunspell/hunspell:hunspell:g' -i *.h || die
-	if use video; then
-		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
-	fi
-	qt4-r2_src_prepare
-}
-
-src_install() {
-	make_desktop_entry texstudio "LaTeX Editor" texstudio "text/X-tex"
-	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.4.ebuild b/app-office/texstudio/texstudio-2.4.ebuild
deleted file mode 100644
index 3ae54f97c367..000000000000
--- a/app-office/texstudio/texstudio-2.4.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.4.ebuild,v 1.3 2013/03/02 19:38:36 hwoarang 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
-	>=dev-qt/qtwebkit-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}"/${P}-hunspell.patch
-	"${FILESDIR}"/${P}-desktop.patch
-# Get it from fedora once they have bumped
-#	"${FILESDIR}"/${P}-xdg-open.patch
-	)
-
-src_prepare() {
-	find hunspell -delete
-	sed 's:hunspell/hunspell:hunspell:g' -i *.h || 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.ebuild b/app-office/texstudio/texstudio-2.5.2-r1.ebuild
index c99f507967c5..69e2a7b076f5 100644
--- a/app-office/texstudio/texstudio-2.5.ebuild
+++ b/app-office/texstudio/texstudio-2.5.2-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.ebuild,v 1.2 2013/03/02 19:38:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.5.2-r1.ebuild,v 1.1 2013/03/17 12:27:57 jlec Exp $
 
-EAPI=4
+EAPI=5
 
 inherit base fdo-mime qt4-r2
 
@@ -17,7 +17,7 @@ IUSE="video"
 
 COMMON_DEPEND="
 	app-text/hunspell
-	app-text/poppler[qt4]
+	app-text/poppler:=[qt4]
 	x11-libs/libX11
 	x11-libs/libXext
 	>=dev-qt/qtgui-4.6.1:4
@@ -37,16 +37,16 @@ DEPEND="${COMMON_DEPEND}
 S="${WORKDIR}"/${P/-/}
 
 PATCHES=(
-	"${FILESDIR}"/${P}-hunspell.patch
+	"${FILESDIR}"/${PN}-2.5-hunspell.patch
 # 441914
 #	"${FILESDIR}"/${P}-qtsingle.patch
 	"${FILESDIR}"/${PN}-2.4-desktop.patch
 # Get it from fedora
-	"${FILESDIR}"/${P}-viewers-use-xdg-open.patch
+	"${FILESDIR}"/${PN}-2.5-viewers-use-xdg-open.patch
 	)
 
 src_prepare() {
-	find hunspell -delete
+	find hunspell utilities/poppler-data -delete || die
 	if use video; then
 		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
 	fi