Bump to EAPI=5, drop rpath due to security implications, fix desktop file, do not double install desktop files, fix underlinking, #540600; drop old fixes #464228 and #486908

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

9 files changed, 170 insertions, 80 deletions

diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog
index cfae94ad10a0..30250e855e61 100644
--- a/app-office/texmacs/ChangeLog
+++ b/app-office/texmacs/ChangeLog
@@ -1,6 +1,17 @@
 # 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.119 2014/10/20 14:49:18 grozin Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.120 2015/02/20 08:42:56 jlec Exp $
+
+*texmacs-1.99.2-r1 (20 Feb 2015)
+
+  20 Feb 2015; Justin Lecher <jlec@gentoo.org>
+  +files/texmacs-1.99.2-desktop.patch, +files/texmacs-1.99.2-norpath.patch,
+  +files/texmacs-1.99.2-underlinking.patch, +texmacs-1.99.2-r1.ebuild,
+  -texmacs-1.0.7.2-r1.ebuild, texmacs-1.0.7.21.ebuild, texmacs-1.99.1.ebuild,
+  texmacs-1.99.2.ebuild:
+  Bump to EAPI=5, drop rpath due to security implications, fix desktop file, do
+  not double install desktop files, fix underlinking, #540600; drop old fixes
+  #464228 and #486908
 
 *texmacs-1.99.2 (20 Oct 2014)
 
diff --git a/app-office/texmacs/files/texmacs-1.99.2-desktop.patch b/app-office/texmacs/files/texmacs-1.99.2-desktop.patch
new file mode 100644
index 000000000000..275f5571ebd8
--- /dev/null
+++ b/app-office/texmacs/files/texmacs-1.99.2-desktop.patch
@@ -0,0 +1,23 @@
+ TeXmacs/misc/mime/texmacs.desktop | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/TeXmacs/misc/mime/texmacs.desktop b/TeXmacs/misc/mime/texmacs.desktop
+index 493103c..cfd66b3 100644
+--- a/TeXmacs/misc/mime/texmacs.desktop
++++ b/TeXmacs/misc/mime/texmacs.desktop
+@@ -1,14 +1,9 @@
+ [Desktop Entry]
+ Name=GNU TeXmacs
+ Comment=A structured wysiwyg scientific text editor
+-BinaryPattern=texmacs
+-Protocols=
+ MimeType=text/x-texmacs;text/plain;text/x-tex;
+ Exec=texmacs %f
+ Icon=TeXmacs
+-TerminalOptions=
+-Path=
+ Type=Application
+-Terminal=0
+-MapNotify=false
++Terminal=false
+ Categories=Education;Science;Math;
diff --git a/app-office/texmacs/files/texmacs-1.99.2-norpath.patch b/app-office/texmacs/files/texmacs-1.99.2-norpath.patch
new file mode 100644
index 000000000000..b210a78c6d01
--- /dev/null
+++ b/app-office/texmacs/files/texmacs-1.99.2-norpath.patch
@@ -0,0 +1,16 @@
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index d79d4b2..8a558af 100644
+--- a/configure.in
++++ b/configure.in
+@@ -691,7 +691,7 @@ CONFIG_CXXOPTIMIZE="-O2"
+ CONFIG_BSTATIC="-lXdmcp -lXau -lXrender"
+ CONFIG_BSHARED="-Wl,-Bdynamic"
+ CONFIG_BFLAGS=""
+-CONFIG_BPATH="-Wl,-rpath,"
++CONFIG_BPATH=""
+ CONFIG_LDRT=""
+ CONFIG_WORD_LENGTH="4"
+ CONFIG_WORD_LENGTH_INC="3"
diff --git a/app-office/texmacs/files/texmacs-1.99.2-underlinking.patch b/app-office/texmacs/files/texmacs-1.99.2-underlinking.patch
new file mode 100644
index 000000000000..69a37aae71e5
--- /dev/null
+++ b/app-office/texmacs/files/texmacs-1.99.2-underlinking.patch
@@ -0,0 +1,16 @@
+ src/makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/makefile.in b/src/makefile.in
+index f5666c2..b9a10d6 100644
+--- a/src/makefile.in
++++ b/src/makefile.in
+@@ -399,7 +399,7 @@ TEXMACS_objects := $(strip $(call uses,system kernel data graphics\
+ 
+ link_options:=-L$(tmsrc)/lib $(LDRT) -lm $(LDPATH) $(LDGUI) $(LDICONV) \
+    $(LDGUILE) $(LDAXEL) $(LDCAIRO) $(LDIMLIB2) $(LDSQLITE3) $(LDFREETYPE) \
+-   $(LDDL) $(LDSPARKLE)
++   $(LDDL) $(LDSPARKLE) -lz
+ 
+ $(tmsrc)/bin/texmacs.bin: Objects/texmacs-$(link).bin
+ 	$(CP) $^ $@
diff --git a/app-office/texmacs/texmacs-1.0.7.2-r1.ebuild b/app-office/texmacs/texmacs-1.0.7.2-r1.ebuild
deleted file mode 100644
index 2a3b61bf15b8..000000000000
--- a/app-office/texmacs/texmacs-1.0.7.2-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.2-r1.ebuild,v 1.11 2014/08/01 10:24:23 armin76 Exp $
-EAPI=2
-inherit autotools eutils
-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/targz/${MY_P}.tar.gz
-	ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-600dpi-fonts.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="imlib jpeg netpbm svg spell"
-KEYWORDS="alpha amd64 ppc x86"
-
-RDEPEND="
-	dev-scheme/guile[deprecated]
-	virtual/latex-base
-	app-text/ghostscript-gpl
-	media-libs/freetype
-	x11-libs/libXext
-	x11-apps/xmodmap
-	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() {
-	# don't strip
-	epatch "${FILESDIR}"/${PN}-strip.patch
-
-	# fix LD_LIBRARY_PATH in tm_mupad_help, bug #337532
-	epatch "${FILESDIR}"/${PN}-mupad.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with imlib imlib2) \
-		--enable-optimize="${CXXFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc TODO || die "dodoc failed"
-	domenu "${FILESDIR}"/TeXmacs.desktop || die "domenu failed"
-
-	# now install the fonts
-	insinto /usr/share/texmf
-	doins -r "${WORKDIR}/fonts" || die "installing fonts failed"
-}
diff --git a/app-office/texmacs/texmacs-1.0.7.21.ebuild b/app-office/texmacs/texmacs-1.0.7.21.ebuild
index bba2293459e6..4b00e69c7943 100644
--- a/app-office/texmacs/texmacs-1.0.7.21.ebuild
+++ b/app-office/texmacs/texmacs-1.0.7.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.6 2014/08/10 17:35:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.21.ebuild,v 1.7 2015/02/20 08:42:56 jlec Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ KEYWORDS="~alpha amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-text/ghostscript-gpl
-	dev-scheme/guile[deprecated]
+	dev-scheme/guile:12[deprecated]
 	media-libs/freetype
 	x11-apps/xmodmap
 	x11-libs/libXext
diff --git a/app-office/texmacs/texmacs-1.99.1.ebuild b/app-office/texmacs/texmacs-1.99.1.ebuild
index 147766715087..3bdaf7c554d5 100644
--- a/app-office/texmacs/texmacs-1.99.1.ebuild
+++ b/app-office/texmacs/texmacs-1.99.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.99.1.ebuild,v 1.3 2014/10/11 13:34:53 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.99.1.ebuild,v 1.4 2015/02/20 08:42:56 jlec Exp $
 
 EAPI=4
 
@@ -17,18 +17,20 @@ SLOT="0"
 IUSE="imlib jpeg netpbm pdf qt4 svg spell"
 KEYWORDS="alpha ~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
 
-RDEPEND="dev-scheme/guile[deprecated]
-	virtual/latex-base
+RDEPEND="
 	app-text/ghostscript-gpl
+	dev-scheme/guile:12[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"
 
diff --git a/app-office/texmacs/texmacs-1.99.2-r1.ebuild b/app-office/texmacs/texmacs-1.99.2-r1.ebuild
new file mode 100644
index 000000000000..fcc9cd197322
--- /dev/null
+++ b/app-office/texmacs/texmacs-1.99.2-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.99.2-r1.ebuild,v 1.1 2015/02/20 08:42:56 jlec Exp $
+
+EAPI=5
+
+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 pdf qt4 svg spell"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-text/ghostscript-gpl
+	dev-scheme/guile:12[deprecated]
+	media-libs/freetype
+	x11-apps/xmodmap
+	x11-libs/libXext
+	virtual/latex-base
+	imlib? ( media-libs/imlib2 )
+	jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) )
+	netpbm? ( media-libs/netpbm )
+	qt4? ( dev-qt/qtgui:4 )
+	spell? ( app-text/aspell )
+	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
+"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# respect LDFLAGS, bug #338459
+	"${FILESDIR}"/${PN}-plugins-1.patch
+
+	# dont update mime and desktop databases and icon cache
+	"${FILESDIR}"/${PN}-updates.patch
+
+	# underlinking 540600
+	"${FILESDIR}"/${P}-underlinking.patch
+
+	# scanelf: rpath_security_checks(): Security problem NULL DT_RUNPATH
+	"${FILESDIR}"/${P}-norpath.patch
+
+	"${FILESDIR}"/${P}-desktop.patch
+)
+
+src_prepare() {
+	epatch ${PATCHES[@]}
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-optimize="${CXXFLAGS}" \
+		$(use_with imlib imlib2) \
+		$(use_enable qt4 qt) \
+		$(use_enable pdf pdf-renderer)
+}
+
+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.99.2.ebuild b/app-office/texmacs/texmacs-1.99.2.ebuild
index 185d5879a9e4..a3e4c5919a86 100644
--- a/app-office/texmacs/texmacs-1.99.2.ebuild
+++ b/app-office/texmacs/texmacs-1.99.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.99.2.ebuild,v 1.1 2014/10/20 14:49:18 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.99.2.ebuild,v 1.2 2015/02/20 08:42:56 jlec Exp $
 
 EAPI=4
 
@@ -17,18 +17,20 @@ SLOT="0"
 IUSE="imlib jpeg netpbm pdf qt4 svg spell"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
 
-RDEPEND="dev-scheme/guile[deprecated]
-	virtual/latex-base
+RDEPEND="
 	app-text/ghostscript-gpl
+	dev-scheme/guile:12[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"