4 files changed, 25 insertions, 88 deletions
diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog
index ef6e910fc56f..819fcb8bc252 100644
--- a/app-office/texmacs/ChangeLog
+++ b/app-office/texmacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/texmacs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.112 2014/05/01 12:37:09 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.113 2014/06/05 07:04:21 jlec Exp $
+
+  05 Jun 2014; Justin Lecher <jlec@gentoo.org> -texmacs-1.0.7.20.ebuild,
+  texmacs-1.0.7.21.ebuild, metadata.xml:
+  Drop old and bump to EAPI=5
 
 *texmacs-1.99.1 (01 May 2014)
 
diff --git a/app-office/texmacs/metadata.xml b/app-office/texmacs/metadata.xml
index 2eeb13f09911..116f8418632e 100644
--- a/app-office/texmacs/metadata.xml
+++ b/app-office/texmacs/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-        <email>grozin@gentoo.org</email>
-        <name>Andrey Grozin</name>
-</maintainer>
-<use>
-  <flag name='netpbm'>Add support for <pkg>media-libs/netpbm</pkg></flag>
-  <flag name='pdf'>Add the experimental native pdf export</flag>
-</use>
+  <herd>sci</herd>
+  <maintainer>
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <use>
+    <flag name="netpbm">Add support for <pkg>media-libs/netpbm</pkg></flag>
+    <flag name="pdf">Add the experimental native pdf export</flag>
+  </use>
 </pkgmetadata>
diff --git a/app-office/texmacs/texmacs-1.0.7.20.ebuild b/app-office/texmacs/texmacs-1.0.7.20.ebuild
deleted file mode 100644
index baeb28f37652..000000000000
--- a/app-office/texmacs/texmacs-1.0.7.20.ebuild
+++ /dev/null
@@ -1,69 +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/texmacs/texmacs-1.0.7.20.ebuild,v 1.1 2013/10/14 11:17:53 grozin Exp $
-
-EAPI=4
-
-inherit autotools eutils fdo-mime gnome2-utils
-
-MY_P=${P/tex/TeX}-src
-
-DESCRIPTION="Wysiwyg text processor with high-quality maths"
-HOMEPAGE="http://www.texmacs.org/"
-SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="imlib jpeg netpbm qt4 svg spell"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-scheme/guile[deprecated]
-	virtual/latex-base
-	app-text/ghostscript-gpl
-	media-libs/freetype
-	x11-libs/libXext
-	x11-apps/xmodmap
-	qt4? ( dev-qt/qtgui:4 )
-	imlib? ( media-libs/imlib2 )
-	jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) )
-	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
-	netpbm? ( media-libs/netpbm )
-	spell? ( app-text/aspell )"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# respect LDFLAGS, bug #338459
-	epatch "${FILESDIR}"/${PN}-plugins.patch
-
-	# dont update mime and desktop databases and icon cache
-	epatch "${FILESDIR}"/${PN}-updates.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with imlib imlib2) \
-		--enable-optimize="${CXXFLAGS}" \
-		$(use_enable qt4 qt)
-}
-
-src_install() {
-	default
-	domenu "${FILESDIR}"/TeXmacs.desktop
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-office/texmacs/texmacs-1.0.7.21.ebuild b/app-office/texmacs/texmacs-1.0.7.21.ebuild
index 6f437e0d429d..67d8ad45c024 100644
--- a/app-office/texmacs/texmacs-1.0.7.21.ebuild
+++ b/app-office/texmacs/texmacs-1.0.7.21.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.21.ebuild,v 1.1 2014/01/09 07:34:47 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.21.ebuild,v 1.2 2014/06/05 07:04:21 jlec Exp $
 
-EAPI=4
+EAPI=5
 
 inherit autotools eutils fdo-mime gnome2-utils
 
@@ -17,18 +17,20 @@ SLOT="0"
 IUSE="imlib jpeg netpbm qt4 svg spell"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
 
-RDEPEND="dev-scheme/guile[deprecated]
-	virtual/latex-base
+RDEPEND="
 	app-text/ghostscript-gpl
+	dev-scheme/guile[deprecated]
 	media-libs/freetype
-	x11-libs/libXext
 	x11-apps/xmodmap
-	qt4? ( dev-qt/qtgui:4 )
+	x11-libs/libXext
+	virtual/latex-base
 	imlib? ( media-libs/imlib2 )
 	jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) )
-	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
 	netpbm? ( media-libs/netpbm )
-	spell? ( app-text/aspell )"
+	qt4? ( dev-qt/qtgui:4 )
+	spell? ( app-text/aspell )
+	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
+"
 DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
@@ -46,8 +48,8 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_with imlib imlib2) \
 		--enable-optimize="${CXXFLAGS}" \
+		$(use_with imlib imlib2) \
 		$(use_enable qt4 qt)
 }