public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-office/texmacs/files/, app-office/texmacs/
@ 2016-07-31 11:32 David Seifert
  0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2016-07-31 11:32 UTC (permalink / raw
  To: gentoo-commits

commit:     180d5057ebee300fce12244ba80815b6dd37759d
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 11:24:58 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 11:31:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=180d5057

app-office/texmacs: version bump

Gentoo-bug: 590002
* EAPI=6

Package-Manager: portage-2.3.0

 app-office/texmacs/Manifest                        |  1 +
 .../texmacs-1.99-remove-new-declaration.patch      | 19 +++++
 app-office/texmacs/texmacs-1.99.5.ebuild           | 81 ++++++++++++++++++++++
 3 files changed, 101 insertions(+)

diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index bc94a62..172d8cd 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -1,3 +1,4 @@
 DIST TeXmacs-1.0.7.21-src.tar.gz 18712991 SHA256 0c945611cd057c4af5f7c2232d19b8129caeef0289fa43a53bab1dabb2d603d2 SHA512 7a825297b84c34aa7b097026932a99bcaf7bdddeb44ad7d141cae1b03893e2472241f4cf73f3798dfebd9b226f94bc0ef665d5defb1b133d897e0ba3c8213fee WHIRLPOOL 8d12788ac4458e3b5085d1e11e3c5b1a92de1027fed3652bc232f395e2e77bddd141d4607690990c8a8ad29624f151557bcd9b20847b95d2c164e9772c103976
 DIST TeXmacs-1.99.1-src.tar.gz 19048884 SHA256 7e8425d65b1a02f270eaa021389cb9c3f627c9064cc986bd1ec7f66e0681b2ac SHA512 4b599e020aafa5b0e832d5e4ca9d1fe2013f1880b32f4ddc63e42582ed553d1e6a8ac9a5b2189db040e7bbaef3faffae5c8f79da3657cb2356ba0700f85f7840 WHIRLPOOL 5457169699cbc4ccded02f0a3ee369910ade70f902f1a41d9c43349acb940022afdb08611681e0b20da66a09b507aaa648c147d4a57d9a7e8d12bb53795b7003
 DIST TeXmacs-1.99.2-src.tar.gz 18957858 SHA256 da017f0d5c927adc33952a6efd773165f63e1eaa509f627857f145434e7a8850 SHA512 e9d2dd0aab2e66470c4ae860e13b6fad2cc07913f14f7bca042c703d4d8b4a62fafafa711b81a0d8f8c125a3641b8bb5f38cd3adac74ec18895671423aa60be9 WHIRLPOOL b0ace20c3df61461f5fcad172b9a3acc69c43800ee600718ba20866452a938f3a5f7d61d33bb4e9f4e67f0666486f6e71387c78fd49d2ff7fb703f4baaf6a326
+DIST TeXmacs-1.99.5-src.tar.gz 25014543 SHA256 f1929f35ee6e4301667433ed2f64de7660a08066e864fcb6fffbc031f667b3a6 SHA512 a7d846fd8823e486cf724bfcbe04ae877dd64995d6131af59b49427a1178e36b52b9fcd9109783b9ae1e39c988ae9ed497b1540dce29645ebf2c4301ca7357a8 WHIRLPOOL 13809c4cbfbcc7dbdb3c84917e00f407484095cbf16863fcc9d92fa0833c6dd5d2cafb25d1f2ac9bc1cc5131aea1f273be4b2a8ff47c33014e1b1d53c4f5ec5e

diff --git a/app-office/texmacs/files/texmacs-1.99-remove-new-declaration.patch b/app-office/texmacs/files/texmacs-1.99-remove-new-declaration.patch
new file mode 100644
index 0000000..45b0822
--- /dev/null
+++ b/app-office/texmacs/files/texmacs-1.99-remove-new-declaration.patch
@@ -0,0 +1,19 @@
+Remove new/delete declarations, which cause problems with recent GCC versions:
+* /usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/include/g++-v4/new:135:41: error: declaration of ‘void operator delete [](void*) throw ()’ has a different exception specifier
+
+See also: https://bugs.gentoo.org/show_bug.cgi?id=590002
+
+--- TeXmacs-1.99.5-src/src/System/Misc/fast_alloc.hpp
++++ TeXmacs-1.99.5-src/src/System/Misc/fast_alloc.hpp
+@@ -384,11 +384,6 @@
+ void  operator delete (register void* ptr) throw();
+ void* operator new[] (register size_t s) throw(std::bad_alloc);
+ void  operator delete[] (register void* ptr) throw();
+-#else
+-void* operator new (register size_t s);
+-void  operator delete (register void* ptr);
+-void* operator new[] (register size_t s);
+-void  operator delete[] (register void* ptr);
+ #endif
+ #endif // not defined NO_FAST_ALLOC
+ 

diff --git a/app-office/texmacs/texmacs-1.99.5.ebuild b/app-office/texmacs/texmacs-1.99.5.ebuild
new file mode 100644
index 0000000..23bfeca
--- /dev/null
+++ b/app-office/texmacs/texmacs-1.99.5.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools 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
+
+	"${FILESDIR}"/${PN}-1.99.2-desktop.patch
+
+	# remove new/delete declarations, bug 590002
+	"${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+
+	eautoreconf
+
+	# delete files that contain binary
+	# headers only used on OS X
+	rm src/{Plugins/Ghostscript/._ghostscript.cpp,System/Misc/._sys_utils.cpp} || die
+}
+
+src_configure() {
+	econf \
+		--enable-optimize="${CXXFLAGS}" \
+		$(use_with imlib imlib2) \
+		$(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
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/texmacs/files/, app-office/texmacs/
@ 2018-04-15 14:52 Sergei Trofimovich
  0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2018-04-15 14:52 UTC (permalink / raw
  To: gentoo-commits

commit:     dafbb1556e9b31a848134693e6a59cf41f95887b
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 15 14:52:05 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 14:52:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dafbb155

app-office/texmacs: fix build failure on 32-bit hosts, bug #652054

C compiler compiles this code for bot int-based and size_t-based
guile. C++ compiler does not (and is what used by texmacs).

Closes: https://bugs.gentoo.org/652054
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 .../texmacs/files/texmacs-1.99.6-guile-size_t.patch | 21 +++++++++++++++++++++
 app-office/texmacs/texmacs-1.99.6-r2.ebuild         |  3 +++
 2 files changed, 24 insertions(+)

diff --git a/app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch b/app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch
new file mode 100644
index 00000000000..3068169618f
--- /dev/null
+++ b/app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch
@@ -0,0 +1,21 @@
+C compiler compiles this code for bot int-based and size_t-based
+guile. C++ compiler does not (and is what used by texmacs).
+
+https://bugs.gentoo.org/652054
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 37e9e87..5de2711 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -274,11 +274,11 @@ SET(CMAKE_REQUIRED_FLAGS "-Werror ${Guile_CFLAGS}")
+ SET(CMAKE_REQUIRED_INCLUDES ${Guile_INCLUDE_DIRS})
+ SET(CMAKE_REQUIRED_LIBRARIES ${Guile_LIBRARIES})
+ 
+ MESSAGE(STATUS "Checking the size_t of guile strings")
+ 
+-CHECK_C_SOURCE_COMPILES(  "#include <guile/gh.h>
++CHECK_CXX_SOURCE_COMPILES(  "#include <guile/gh.h>
+   #include <libguile.h>
+   void print_string (SCM s) {
+     int len_r;
+     char* r= gh_scm2newstr (s, &len_r); } int main() { return 0; }
+ " _guile_str_size_test)

diff --git a/app-office/texmacs/texmacs-1.99.6-r2.ebuild b/app-office/texmacs/texmacs-1.99.6-r2.ebuild
index e2d3ac76e18..cdc5bdd2566 100644
--- a/app-office/texmacs/texmacs-1.99.6-r2.ebuild
+++ b/app-office/texmacs/texmacs-1.99.6-r2.ebuild
@@ -51,6 +51,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch
 
 	"${FILESDIR}"/${PN}-1.99.6-math_util.patch
+
+	# fix build failure on 32-bit systems, bug #652054
+	"${FILESDIR}"/${PN}-1.99.6-guile-size_t.patch
 )
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/texmacs/files/, app-office/texmacs/
@ 2018-05-06 20:18 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-05-06 20:18 UTC (permalink / raw
  To: gentoo-commits

commit:     25a32a798855fc6a3995192233a40a686ee03053
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May  6 17:58:33 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May  6 20:17:46 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25a32a79

app-office/texmacs: Drop old, de-stabilise ppc

Closes: https://bugs.gentoo.org/644606
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 app-office/texmacs/Manifest                        |  2 -
 .../texmacs/files/texmacs-1.99.2-norpath.patch     | 16 -----
 .../files/texmacs-1.99.2-underlinking.patch        | 16 -----
 app-office/texmacs/metadata.xml                    |  1 -
 app-office/texmacs/texmacs-1.99.2-r1.ebuild        | 83 ----------------------
 app-office/texmacs/texmacs-1.99.5.ebuild           | 81 ---------------------
 app-office/texmacs/texmacs-1.99.6-r1.ebuild        | 71 ------------------
 app-office/texmacs/texmacs-1.99.6.ebuild           | 79 --------------------
 8 files changed, 349 deletions(-)

diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index 9305bd7c55f..74e06e2af0e 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -1,3 +1 @@
-DIST TeXmacs-1.99.2-src.tar.gz 18957858 BLAKE2B e109f012158d3382d26c52db2695df3d15fcbf45b85437e4bde0854a52762c6fd3ac630408d3e1e6cd29cb121def3bd6ce217464fc638c99fa120718ab7b7a5e SHA512 e9d2dd0aab2e66470c4ae860e13b6fad2cc07913f14f7bca042c703d4d8b4a62fafafa711b81a0d8f8c125a3641b8bb5f38cd3adac74ec18895671423aa60be9
-DIST TeXmacs-1.99.5-src.tar.gz 25014543 BLAKE2B 22c6f876015e6641959cded32dae93eda7e1c153f82c2fb60c026c9243c6e35d4b29df42c265a947e64a07cb72de6436e066713b200e3ec66bd4f1f274473807 SHA512 a7d846fd8823e486cf724bfcbe04ae877dd64995d6131af59b49427a1178e36b52b9fcd9109783b9ae1e39c988ae9ed497b1540dce29645ebf2c4301ca7357a8
 DIST TeXmacs-1.99.6-src.tar.gz 25081652 BLAKE2B 08d0a141ff1b8ab59def50c636d917f9290488031d6f7f4343be4a04af44d8994dc791eb23a2a2b71b7a853a3a90482313062fbfc045cf585afdf8f1f8d2a5f3 SHA512 2e262037654493075cc4a3d47b93de08c3ad2d6f10ce5fe814a8046b38d327c5dd88c1575dff7e2145f1541f9765dc50ec5abcd63146090eea98ab5db9d103ee

diff --git a/app-office/texmacs/files/texmacs-1.99.2-norpath.patch b/app-office/texmacs/files/texmacs-1.99.2-norpath.patch
deleted file mode 100644
index b210a78c6d0..00000000000
--- a/app-office/texmacs/files/texmacs-1.99.2-norpath.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- 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
deleted file mode 100644
index 69a37aae71e..00000000000
--- a/app-office/texmacs/files/texmacs-1.99.2-underlinking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- 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/metadata.xml b/app-office/texmacs/metadata.xml
index d6df84643b7..ba45e88b5f0 100644
--- a/app-office/texmacs/metadata.xml
+++ b/app-office/texmacs/metadata.xml
@@ -11,6 +11,5 @@
   </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.99.2-r1.ebuild b/app-office/texmacs/texmacs-1.99.2-r1.ebuild
deleted file mode 100644
index 8871e631366..00000000000
--- a/app-office/texmacs/texmacs-1.99.2-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~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-base/xorg-proto"
-
-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
-
-	# remove new/delete declarations, bug 590002
-	"${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	mv configure.{in,ac} || die
-
-	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.5.ebuild b/app-office/texmacs/texmacs-1.99.5.ebuild
deleted file mode 100644
index 879508352d2..00000000000
--- a/app-office/texmacs/texmacs-1.99.5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools fdo-mime gnome2-utils qmake-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 svg spell"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	<dev-scheme/guile-1.9[deprecated]
-	media-libs/freetype
-	x11-apps/xmodmap
-	x11-libs/libXext
-	virtual/latex-base
-	dev-qt/qtgui:4
-	imlib? ( media-libs/imlib2 )
-	jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) )
-	netpbm? ( media-libs/netpbm )
-	spell? ( app-text/aspell )
-	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-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
-
-	"${FILESDIR}"/${PN}-1.99.2-desktop.patch
-
-	# remove new/delete declarations, bug 590002
-	"${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.{in,ac} || die
-
-	eautoreconf
-
-	# delete files that contain binary
-	# headers only used on OS X
-	rm src/{Plugins/Ghostscript/._ghostscript.cpp,System/Misc/._sys_utils.cpp} || die
-}
-
-src_configure() {
-	econf \
-		--enable-optimize="${CXXFLAGS}" \
-		--with-qt="$(qt4_get_bindir)" \
-		$(use_with imlib imlib2) \
-		$(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.6-r1.ebuild b/app-office/texmacs/texmacs-1.99.6-r1.ebuild
deleted file mode 100644
index 22770bc0ecc..00000000000
--- a/app-office/texmacs/texmacs-1.99.6-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils gnome2-utils qmake-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="jpeg netpbm sqlite svg spell"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	<dev-scheme/guile-1.9[deprecated]
-	media-libs/freetype
-	x11-apps/xmodmap
-	x11-libs/libXext
-	virtual/latex-base
-	dev-qt/qtwidgets:5
-	dev-qt/qtprintsupport:5
-	sqlite? ( dev-db/sqlite )
-	jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) )
-	netpbm? ( media-libs/netpbm )
-	spell? ( app-text/aspell )
-	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-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
-
-	"${FILESDIR}"/${PN}-1.99.2-desktop.patch
-
-	# remove new/delete declarations, bug 590002
-	"${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch
-
-	"${FILESDIR}"/${PN}-1.99.6-math_util.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SQLITE=$(usex sqlite sqlite3)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}

diff --git a/app-office/texmacs/texmacs-1.99.6.ebuild b/app-office/texmacs/texmacs-1.99.6.ebuild
deleted file mode 100644
index c4e5c3f4e6f..00000000000
--- a/app-office/texmacs/texmacs-1.99.6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools xdg-utils gnome2-utils qmake-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 svg spell"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	<dev-scheme/guile-1.9[deprecated]
-	media-libs/freetype
-	x11-apps/xmodmap
-	x11-libs/libXext
-	virtual/latex-base
-	dev-qt/qtgui:4
-	imlib? ( media-libs/imlib2 )
-	jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) )
-	netpbm? ( media-libs/netpbm )
-	spell? ( app-text/aspell )
-	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-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
-
-	"${FILESDIR}"/${PN}-1.99.2-desktop.patch
-
-	# remove new/delete declarations, bug 590002
-	"${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch
-
-	"${FILESDIR}"/${PN}-1.99.6-math_util.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.{in,ac} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-optimize="${CXXFLAGS}" \
-		--with-qt="$(qt4_get_bindir)" \
-		$(use_with imlib imlib2) \
-		$(use_enable pdf pdf-renderer)
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/texmacs/files/, app-office/texmacs/
@ 2020-10-23 12:34 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2020-10-23 12:34 UTC (permalink / raw
  To: gentoo-commits

commit:     776bb3db8fcdd63695a7c23ab070fdb52e51d043
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 23 12:27:10 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 12:33:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=776bb3db

app-office/texmacs: Cleanup obsolete versions

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/texmacs/Manifest                      |  3 -
 app-office/texmacs/files/texmacs-plugins-1.patch | 48 ---------------
 app-office/texmacs/files/texmacs-updates.patch   | 29 ---------
 app-office/texmacs/texmacs-1.99.10.ebuild        | 72 ----------------------
 app-office/texmacs/texmacs-1.99.6-r2.ebuild      | 76 ------------------------
 app-office/texmacs/texmacs-1.99.9.ebuild         | 72 ----------------------
 6 files changed, 300 deletions(-)

diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index b77db540f9f..0d23679db96 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -1,4 +1 @@
-DIST TeXmacs-1.99.10-src.tar.gz 31879944 BLAKE2B 3576d1abff1040d2b0236718a5ef5149bf0e445567408e44b85cae5d43a631acd42fa59f0973e375e347720083ee2368398a1a2cec6aa679c5f47a3952877615 SHA512 5da8e789a5f7b6b9e2846714c751173616e572b5426f2c29d7f979037b1bca1542c9e77048abf9c5b95974e7b198c2a857bfa84eeb428390b2c1088bf87984d8
 DIST TeXmacs-1.99.11-src.tar.gz 32798336 BLAKE2B 352e333b51fbf27589377f638dda4f4fa09ca6aee6d0016a103ef3b4ba71b766930b7202f6fc3d060f72e4ccbbf311f438975317844587461880f99c7dff596d SHA512 3f3481834baeeee93afc2c2de1666297b8c02d7dc5223b00ee93120e175503c91bdcc3d9ff4d8df498033064b2e67b12ffd47af9e8b95ad5eee12b47ec076855
-DIST TeXmacs-1.99.6-src.tar.gz 25081652 BLAKE2B 08d0a141ff1b8ab59def50c636d917f9290488031d6f7f4343be4a04af44d8994dc791eb23a2a2b71b7a853a3a90482313062fbfc045cf585afdf8f1f8d2a5f3 SHA512 2e262037654493075cc4a3d47b93de08c3ad2d6f10ce5fe814a8046b38d327c5dd88c1575dff7e2145f1541f9765dc50ec5abcd63146090eea98ab5db9d103ee
-DIST TeXmacs-1.99.9-src.tar.gz 30109108 BLAKE2B 182db26c645e1445780f8e153f7283eb517ec3aa8be6ce137b6c305df33657f15c3efb57198e81f8dd9e1682b3bf1c6c0ff6f3798c54bcb74aedb8b3cef67b40 SHA512 96971060536007e542cd3e1789f07bcc30ceda01cbf32cabf43e3a5e61a2ba15f604e49601d891a956732d90d224353f8dac495be05677758146206b549f9d1f

diff --git a/app-office/texmacs/files/texmacs-plugins-1.patch b/app-office/texmacs/files/texmacs-plugins-1.patch
deleted file mode 100644
index 1d3299f407c..00000000000
--- a/app-office/texmacs/files/texmacs-plugins-1.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -r -U1 TeXmacs-1.0.7.21-src.orig/plugins/axiom/Makefile TeXmacs-1.0.7.21-src/plugins/axiom/Makefile
---- TeXmacs-1.0.7.21-src.orig/plugins/axiom/Makefile	2013-11-04 06:09:24.000000000 +0700
-+++ TeXmacs-1.0.7.21-src/plugins/axiom/Makefile	2013-12-29 02:40:24.263756226 +0700
-@@ -16,3 +16,3 @@
- bin/tm_axiom: src/tm_axiom.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) src/tm_axiom.c -o bin/tm_axiom
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/tm_axiom.c -o bin/tm_axiom
- 
-diff -r -U1 TeXmacs-1.0.7.21-src.orig/plugins/graphviz/Makefile TeXmacs-1.0.7.21-src/plugins/graphviz/Makefile
---- TeXmacs-1.0.7.21-src.orig/plugins/graphviz/Makefile	2013-11-04 06:09:18.000000000 +0700
-+++ TeXmacs-1.0.7.21-src/plugins/graphviz/Makefile	2013-12-29 02:41:10.245753123 +0700
-@@ -16,3 +16,3 @@
- bin/tm_graphviz: src/tm_graphviz.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) src/tm_graphviz.c -o bin/tm_graphviz
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/tm_graphviz.c -o bin/tm_graphviz
- 
-diff -r -U1 TeXmacs-1.0.7.21-src.orig/plugins/maple/Makefile TeXmacs-1.0.7.21-src/plugins/maple/Makefile
---- TeXmacs-1.0.7.21-src.orig/plugins/maple/Makefile	2013-11-04 06:09:23.000000000 +0700
-+++ TeXmacs-1.0.7.21-src/plugins/maple/Makefile	2013-12-29 02:41:45.834750721 +0700
-@@ -17,3 +17,3 @@
- bin/tm_maple_5: src/tm_maple_5.cpp
--	$(CXX) $(CPPFLAGS) $(CXXFLAGS) src/tm_maple_5.cpp -o bin/tm_maple_5
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) src/tm_maple_5.cpp -o bin/tm_maple_5
- 
-diff -r -U1 TeXmacs-1.0.7.21-src.orig/plugins/mathematica/Makefile TeXmacs-1.0.7.21-src/plugins/mathematica/Makefile
---- TeXmacs-1.0.7.21-src.orig/plugins/mathematica/Makefile	2013-11-04 06:09:22.000000000 +0700
-+++ TeXmacs-1.0.7.21-src/plugins/mathematica/Makefile	2013-12-29 02:42:33.470747506 +0700
-@@ -14,3 +14,3 @@
- bin/realpath: src/realpath.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) src/realpath.c -o bin/realpath
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/realpath.c -o bin/realpath
- 
-diff -r -U1 TeXmacs-1.0.7.21-src.orig/plugins/r/Makefile TeXmacs-1.0.7.21-src/plugins/r/Makefile
---- TeXmacs-1.0.7.21-src.orig/plugins/r/Makefile	2013-11-04 06:09:24.000000000 +0700
-+++ TeXmacs-1.0.7.21-src/plugins/r/Makefile	2013-12-29 02:43:32.538743520 +0700
-@@ -16,3 +16,3 @@
- bin/tm_r: src/tm_r.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) -I../../src/System src/tm_r.c -o bin/tm_r -lutil
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -I../../src/System src/tm_r.c -o bin/tm_r -lutil
- 
-diff -r -U1 TeXmacs-1.0.7.21-src.orig/plugins/shell/Makefile TeXmacs-1.0.7.21-src/plugins/shell/Makefile
---- TeXmacs-1.0.7.21-src.orig/plugins/shell/Makefile	2013-11-04 06:09:21.000000000 +0700
-+++ TeXmacs-1.0.7.21-src/plugins/shell/Makefile	2013-12-29 02:44:07.584741155 +0700
-@@ -16,3 +16,3 @@
- bin/tm_shell: src/tm_shell.cpp
--	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -I../../src/System src/tm_shell.cpp -o bin/tm_shell -lutil
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -I../../src/System src/tm_shell.cpp -o bin/tm_shell -lutil
- 

diff --git a/app-office/texmacs/files/texmacs-updates.patch b/app-office/texmacs/files/texmacs-updates.patch
deleted file mode 100644
index f9517cd25ed..00000000000
--- a/app-office/texmacs/files/texmacs-updates.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -r -U1 TeXmacs-1.0.7.16-src.orig/Makefile.in TeXmacs-1.0.7.16-src/Makefile.in
---- TeXmacs-1.0.7.16-src.orig/Makefile.in	2012-07-09 21:33:36.000000000 +0700
-+++ TeXmacs-1.0.7.16-src/Makefile.in	2012-09-16 11:20:06.000000000 +0700
-@@ -171,3 +171,2 @@
- 	$(DESTDIR)$(datadir)/applications
--	@update-desktop-database 2>/dev/null || :
- 	$(MKDIR) $(DESTDIR)$(datadir)/application-registry
-@@ -181,3 +180,2 @@
- 	$(CP) $(tmdir)/misc/mime/texmacs.xml $(DESTDIR)$(datadir)/mime/packages
--	@update-mime-database $(DESTDIR)$(datadir)/mime/ 2>/dev/null || :
- 	$(MKDIR) $(DESTDIR)$(datadir)/pixmaps
-@@ -193,4 +191,2 @@
- 	$(DESTDIR)$(datadir)/icons/gnome/scalable/mimetypes
--	@gtk-update-icon-cache -t --force \
--		$(DESTDIR)$(datadir)/icons/gnome 2>/dev/null || :
- 	@echo installed TeXmacs mime info in $(DESTDIR)$(datadir)
-@@ -223,3 +219,2 @@
- 	$(RM) $(datadir)/applications/texmacs.desktop
--	@update-desktop-database 2>/dev/null || :
- 	$(RM) $(datadir)/application-registry/texmacs.applications
-@@ -228,3 +223,2 @@
- 	$(RM) $(datadir)/mime/packages/texmacs.xml
--	@update-mime-database $(DESTDIR)$(datadir)/mime/ 2>/dev/null || :
- 	$(RM) $(datadir)/pixmaps/TeXmacs.xpm
-@@ -232,4 +226,2 @@
- 	$(RM) $(datadir)/icons/gnome/scalable/mimetypes/text-texmacs.svg
--	@gtk-update-icon-cache -t --force \
--		$(DESTDIR)$(datadir)/icons/gnome 2>/dev/null || :
- 	@echo removed TeXmacs mime info from $(datadir)

diff --git a/app-office/texmacs/texmacs-1.99.10.ebuild b/app-office/texmacs/texmacs-1.99.10.ebuild
deleted file mode 100644
index ec2993ea4b5..00000000000
--- a/app-office/texmacs/texmacs-1.99.10.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils gnome2-utils qmake-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="debug jpeg netpbm sqlite svg spell"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	<dev-scheme/guile-1.9[debug?,deprecated]
-	media-libs/freetype
-	x11-apps/xmodmap
-	x11-libs/libXext
-	virtual/latex-base
-	>=dev-qt/qtcore-5.9.1:5
-	>=dev-qt/qtgui-5.9.1:5
-	>=dev-qt/qtwidgets-5.9.1:5
-	>=dev-qt/qtprintsupport-5.9.1:5
-	sqlite? ( dev-db/sqlite )
-	jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) )
-	netpbm? ( media-libs/netpbm )
-	spell? ( app-text/aspell )
-	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.99.2-desktop.patch
-
-	# remove new/delete declarations, bug 590002
-	"${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch
-
-	"${FILESDIR}"/${PN}-1.99.6-math_util.patch
-
-	# fix build failure on 32-bit systems, bug #652054
-	#	"${FILESDIR}"/${PN}-1.99.6-guile-size_t.patch
-	#"${FILESDIR}"/${PN}-1.99.9-guile-remove-deprecated.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SQLITE3=$(usex sqlite 1 0)
-		-DDEBUG_ASSERT=$(usex debug 1 0)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}

diff --git a/app-office/texmacs/texmacs-1.99.6-r2.ebuild b/app-office/texmacs/texmacs-1.99.6-r2.ebuild
deleted file mode 100644
index d033045a79f..00000000000
--- a/app-office/texmacs/texmacs-1.99.6-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils gnome2-utils qmake-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="jpeg netpbm sqlite svg spell"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	<dev-scheme/guile-1.9[deprecated]
-	media-libs/freetype
-	x11-apps/xmodmap
-	x11-libs/libXext
-	virtual/latex-base
-	>=dev-qt/qtcore-5.9.1:5
-	>=dev-qt/qtgui-5.9.1:5
-	>=dev-qt/qtwidgets-5.9.1:5
-	>=dev-qt/qtprintsupport-5.9.1:5
-	sqlite? ( dev-db/sqlite )
-	jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) )
-	netpbm? ( media-libs/netpbm )
-	spell? ( app-text/aspell )
-	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-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
-
-	"${FILESDIR}"/${PN}-1.99.2-desktop.patch
-
-	# remove new/delete declarations, bug 590002
-	"${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch
-
-	"${FILESDIR}"/${PN}-1.99.6-math_util.patch
-
-	# fix build failure on 32-bit systems, bug #652054
-	"${FILESDIR}"/${PN}-1.99.6-guile-size_t.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SQLITE=$(usex sqlite sqlite3)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}

diff --git a/app-office/texmacs/texmacs-1.99.9.ebuild b/app-office/texmacs/texmacs-1.99.9.ebuild
deleted file mode 100644
index f8602df8754..00000000000
--- a/app-office/texmacs/texmacs-1.99.9.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils gnome2-utils qmake-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="debug jpeg netpbm sqlite svg spell"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	<dev-scheme/guile-1.9[debug?,deprecated]
-	media-libs/freetype
-	x11-apps/xmodmap
-	x11-libs/libXext
-	virtual/latex-base
-	>=dev-qt/qtcore-5.9.1:5
-	>=dev-qt/qtgui-5.9.1:5
-	>=dev-qt/qtwidgets-5.9.1:5
-	>=dev-qt/qtprintsupport-5.9.1:5
-	sqlite? ( dev-db/sqlite )
-	jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) )
-	netpbm? ( media-libs/netpbm )
-	spell? ( app-text/aspell )
-	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.99.2-desktop.patch
-
-	# remove new/delete declarations, bug 590002
-	"${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch
-
-	"${FILESDIR}"/${PN}-1.99.6-math_util.patch
-
-	# fix build failure on 32-bit systems, bug #652054
-	#	"${FILESDIR}"/${PN}-1.99.6-guile-size_t.patch
-	"${FILESDIR}"/${PN}-1.99.9-guile-remove-deprecated.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SQLITE3=$(usex sqlite 1 0)
-		-DDEBUG_ASSERT=$(usex debug 1 0)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/texmacs/files/, app-office/texmacs/
@ 2021-07-21 15:39 Marek Szuba
  0 siblings, 0 replies; 5+ messages in thread
From: Marek Szuba @ 2021-07-21 15:39 UTC (permalink / raw
  To: gentoo-commits

commit:     8ec33f629aadbc3c0b36554f9e32ade6c26cdc49
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 21 11:55:16 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Jul 21 15:38:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ec33f62

app-office/texmacs: add 2.1, drop 1.99.11

Mind you, this version STILL requires guile-1.8 so it remains masked.

For the record, upstream Web site does support HTTPS but as of
2021-07-21, their Let's Encrypt host certificate is signed by the old
root CA which is no longer accepted by wget.

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 app-office/texmacs/Manifest                        |   2 +-
 .../texmacs-1.99-remove-new-declaration.patch      |  19 --
 .../texmacs/files/texmacs-1.99.2-desktop.patch     |  23 --
 .../files/texmacs-1.99.6-guile-size_t.patch        |  21 --
 .../texmacs/files/texmacs-1.99.6-math_util.patch   |  15 --
 .../texmacs-1.99.9-guile-remove-deprecated.patch   | 295 ---------------------
 .../{texmacs-1.99.11.ebuild => texmacs-2.1.ebuild} |  27 +-
 7 files changed, 8 insertions(+), 394 deletions(-)

diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index 0d23679db96..837b2711ad2 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -1 +1 @@
-DIST TeXmacs-1.99.11-src.tar.gz 32798336 BLAKE2B 352e333b51fbf27589377f638dda4f4fa09ca6aee6d0016a103ef3b4ba71b766930b7202f6fc3d060f72e4ccbbf311f438975317844587461880f99c7dff596d SHA512 3f3481834baeeee93afc2c2de1666297b8c02d7dc5223b00ee93120e175503c91bdcc3d9ff4d8df498033064b2e67b12ffd47af9e8b95ad5eee12b47ec076855
+DIST TeXmacs-2.1-src.tar.gz 35851289 BLAKE2B e29cf78d4c0f8b9d8bf89fd448775979efceaecd409c407bf66622cfa0e0aa166fe9a0abc146a282d71d989cdf03b21a8e17545a93196b868190ecb5fff3e993 SHA512 9e33bfb0a74ca6f6947cfa632adc162776083ae5e5ab46bc85fc8dac5e531457a2f888da5e552d6da39db16e543849a7b86f0fc6918b62e911d35ff725e47a2b

diff --git a/app-office/texmacs/files/texmacs-1.99-remove-new-declaration.patch b/app-office/texmacs/files/texmacs-1.99-remove-new-declaration.patch
deleted file mode 100644
index 45b08226f65..00000000000
--- a/app-office/texmacs/files/texmacs-1.99-remove-new-declaration.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Remove new/delete declarations, which cause problems with recent GCC versions:
-* /usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/include/g++-v4/new:135:41: error: declaration of ‘void operator delete [](void*) throw ()’ has a different exception specifier
-
-See also: https://bugs.gentoo.org/show_bug.cgi?id=590002
-
---- TeXmacs-1.99.5-src/src/System/Misc/fast_alloc.hpp
-+++ TeXmacs-1.99.5-src/src/System/Misc/fast_alloc.hpp
-@@ -384,11 +384,6 @@
- void  operator delete (register void* ptr) throw();
- void* operator new[] (register size_t s) throw(std::bad_alloc);
- void  operator delete[] (register void* ptr) throw();
--#else
--void* operator new (register size_t s);
--void  operator delete (register void* ptr);
--void* operator new[] (register size_t s);
--void  operator delete[] (register void* ptr);
- #endif
- #endif // not defined NO_FAST_ALLOC
- 

diff --git a/app-office/texmacs/files/texmacs-1.99.2-desktop.patch b/app-office/texmacs/files/texmacs-1.99.2-desktop.patch
deleted file mode 100644
index 275f5571ebd..00000000000
--- a/app-office/texmacs/files/texmacs-1.99.2-desktop.patch
+++ /dev/null
@@ -1,23 +0,0 @@
- 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.6-guile-size_t.patch b/app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch
deleted file mode 100644
index 3068169618f..00000000000
--- a/app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-C compiler compiles this code for bot int-based and size_t-based
-guile. C++ compiler does not (and is what used by texmacs).
-
-https://bugs.gentoo.org/652054
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 37e9e87..5de2711 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -274,11 +274,11 @@ SET(CMAKE_REQUIRED_FLAGS "-Werror ${Guile_CFLAGS}")
- SET(CMAKE_REQUIRED_INCLUDES ${Guile_INCLUDE_DIRS})
- SET(CMAKE_REQUIRED_LIBRARIES ${Guile_LIBRARIES})
- 
- MESSAGE(STATUS "Checking the size_t of guile strings")
- 
--CHECK_C_SOURCE_COMPILES(  "#include <guile/gh.h>
-+CHECK_CXX_SOURCE_COMPILES(  "#include <guile/gh.h>
-   #include <libguile.h>
-   void print_string (SCM s) {
-     int len_r;
-     char* r= gh_scm2newstr (s, &len_r); } int main() { return 0; }
- " _guile_str_size_test)

diff --git a/app-office/texmacs/files/texmacs-1.99.6-math_util.patch b/app-office/texmacs/files/texmacs-1.99.6-math_util.patch
deleted file mode 100644
index 006c92c2be3..00000000000
--- a/app-office/texmacs/files/texmacs-1.99.6-math_util.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -r -U2 TeXmacs-1.99.6-src.orig/src/Graphics/Types/math_util.hpp TeXmacs-1.99.6-src/src/Graphics/Types/math_util.hpp
---- TeXmacs-1.99.6-src.orig/src/Graphics/Types/math_util.hpp	2017-12-22 03:27:43.000000000 +0700
-+++ TeXmacs-1.99.6-src/src/Graphics/Types/math_util.hpp	2017-12-22 16:44:35.052378917 +0700
-@@ -24,11 +24,4 @@
- inline int    sign (double x) { return x>0?1:x<0?-1:0; } 
- inline bool   fnull (double x, double approx) { return norm(x) <= approx; }
--#ifndef __SUNPRO_CC
--inline double pow (double x, int n) {
--  double r= 1.0;
--  while (n > 0) { r *= x; n--; }
--  return r; }
--#endif
--
- 
- #endif // defined MATH_UTIL_H

diff --git a/app-office/texmacs/files/texmacs-1.99.9-guile-remove-deprecated.patch b/app-office/texmacs/files/texmacs-1.99.9-guile-remove-deprecated.patch
deleted file mode 100644
index 183c771804f..00000000000
--- a/app-office/texmacs/files/texmacs-1.99.9-guile-remove-deprecated.patch
+++ /dev/null
@@ -1,295 +0,0 @@
-diff -Naruw TeXmacs-1.99.9-src.orig/CMakeLists.txt TeXmacs-1.99.9-src/CMakeLists.txt
---- TeXmacs-1.99.9-src.orig/CMakeLists.txt	2019-02-01 04:33:32.000000000 -0500
-+++ TeXmacs-1.99.9-src/CMakeLists.txt	2019-06-02 17:13:47.980498170 -0400
-@@ -274,7 +274,6 @@
- elseif(Guile_VERSION_STRING VERSION_LESS 3.0)
-   set(CONFIG_GUILE_SERIAL "D")
-   set(GUILE_D 1)
--  set(SCM_SIZET size_t)
- else(Guile_VERSION_STRING VERSION_LESS 1.6)
-   message(ERROR "Not Guile serial A,B,C or D???")
- endif(Guile_VERSION_STRING VERSION_LESS 1.6)
-@@ -286,7 +285,7 @@
- 
- MESSAGE(STATUS "Checking the size_t of guile strings")
- 
--CHECK_C_SOURCE_COMPILES(  "#include <guile/gh.h>
-+CHECK_CXX_SOURCE_COMPILES(  "#include <guile/gh.h>
-   #include <libguile.h>
-   void print_string (SCM s) {
-     int len_r;
-diff -Naruw TeXmacs-1.99.9-src.orig/src/CMakeLists.txt.orig TeXmacs-1.99.9-src/src/CMakeLists.txt.orig
---- TeXmacs-1.99.9-src.orig/src/CMakeLists.txt.orig	1969-12-31 19:00:00.000000000 -0500
-+++ TeXmacs-1.99.9-src/src/CMakeLists.txt.orig	2019-06-02 17:12:44.654011478 -0400
-@@ -0,0 +1,32 @@
-+
-+add_library(texmacs_body STATIC ${TeXmacs_All_SRCS})
-+
-+add_executable (${TeXmacs_binary_name}
-+  ./Texmacs/Texmacs/texmacs.cpp
-+)
-+
-+target_link_libraries (${TeXmacs_binary_name}
-+  texmacs_body
-+  ${TeXmacs_Libraries}
-+)
-+
-+if (APPLE)
-+  set(MACOSX_BUNDLE_DISPLAY_NAME TeXmacs)
-+  set_target_properties (${TeXmacs_binary_name}
-+    PROPERTIES
-+    MACOSX_BUNDLE TRUE
-+    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/MacOSXBundleInfo.plist.in
-+    DEBUG_OUTPUT_NAME ${TeXmacs_binary_name}${EXE_DEBUG_EXTENSION}
-+    RELEASE_OUTPUT_NAME ${TeXmacs_binary_name}
-+    RUNTIME_OUTPUT_DIRECTORY ${TEXMACS_BINARY_DIR}
-+  )
-+else (APPLE)
-+  set_target_properties (${TeXmacs_binary_name}
-+    PROPERTIES
-+    DEBUG_OUTPUT_NAME ${TeXmacs_binary_name}${EXE_DEBUG_EXTENSION}
-+    RELEASE_OUTPUT_NAME ${TeXmacs_binary_name}
-+    RUNTIME_OUTPUT_DIRECTORY ${TEXMACS_BINARY_DIR}
-+  )
-+  install (TARGETS ${TeXmacs_binary_name} DESTINATION lib/texmacs/TeXmacs/bin)
-+endif (APPLE)
-+
-diff -Naruw TeXmacs-1.99.9-src.orig/src/CMakeLists.txt.rej TeXmacs-1.99.9-src/src/CMakeLists.txt.rej
---- TeXmacs-1.99.9-src.orig/src/CMakeLists.txt.rej	1969-12-31 19:00:00.000000000 -0500
-+++ TeXmacs-1.99.9-src/src/CMakeLists.txt.rej	2019-06-02 17:12:44.654011478 -0400
-@@ -0,0 +1,19 @@
-+--- CMakeLists.txt	(revision 11761)
-++++ CMakeLists.txt	(working copy)
-+@@ -274,7 +274,6 @@
-+ elseif (Guile_VERSION_STRING VERSION_LESS 3.0)
-+   set (CONFIG_GUILE_SERIAL "D")
-+   set (GUILE_D 1)
-+-  set (SCM_SIZET size_t)
-+ else (Guile_VERSION_STRING VERSION_LESS 1.6)
-+   message (ERROR "Not Guile serial A,B,C or D???")
-+ endif (Guile_VERSION_STRING VERSION_LESS 1.6)
-+@@ -286,7 +285,7 @@
-+ 
-+ message (STATUS "Checking the size_t of guile strings")
-+ 
-+-check_c_source_compiles ("
-++check_cxx_source_compiles ("
-+ #include <guile/gh.h>
-+ #include <libguile.h>
-+ void print_string (SCM s) {
-diff -Naruw TeXmacs-1.99.9-src.orig/src/Scheme/Guile/guile_tm.cpp TeXmacs-1.99.9-src/src/Scheme/Guile/guile_tm.cpp
---- TeXmacs-1.99.9-src.orig/src/Scheme/Guile/guile_tm.cpp	2018-03-23 08:44:53.000000000 -0400
-+++ TeXmacs-1.99.9-src/src/Scheme/Guile/guile_tm.cpp	2019-06-02 17:13:10.420604916 -0400
-@@ -85,19 +85,34 @@
- #ifndef DEBUG_ON
- static SCM
- TeXmacs_lazy_eval_file (char *file) {
-+#if (defined(GUILE_A) || defined(GUILE_B))
-   return scm_internal_lazy_catch (SCM_BOOL_T,
-                                   (scm_t_catch_body) scm_c_primitive_load, file,
-                                   (scm_t_catch_handler) TeXmacs_lazy_catcher, file);
-+#else
-+  return scm_c_with_throw_handler (SCM_BOOL_T,
-+                                   (scm_t_catch_body) scm_c_primitive_load, file,
-+                                   (scm_t_catch_handler) TeXmacs_lazy_catcher,
-+                                   file, 0);
-+#endif
- }
- #endif
- 
- static SCM
- TeXmacs_eval_file (char *file) {
- #ifndef DEBUG_ON
-+#if (defined(GUILE_A) || defined(GUILE_B))
-   return scm_internal_catch (SCM_BOOL_T,
-                              (scm_t_catch_body) TeXmacs_lazy_eval_file, file,
-                              (scm_t_catch_handler) TeXmacs_catcher, file);
- #else
-+  return scm_c_catch (SCM_BOOL_T,
-+                      (scm_t_catch_body) TeXmacs_lazy_eval_file, file,
-+                      (scm_t_catch_handler) TeXmacs_catcher, file, NULL, NULL);
-+
-+#endif
-+
-+#else
-   return 	scm_c_primitive_load (file);										 
- #endif
- }
-@@ -121,19 +136,33 @@
- #ifndef DEBUG_ON
- static SCM
- TeXmacs_lazy_eval_string (char *s) {
-+#if (defined(GUILE_A) || defined(GUILE_B))
-   return scm_internal_lazy_catch (SCM_BOOL_T,
-                                   (scm_t_catch_body) scm_c_eval_string, s,
-                                   (scm_t_catch_handler) TeXmacs_lazy_catcher, s);
-+#else
-+  return scm_c_with_throw_handler (SCM_BOOL_T,
-+                                   (scm_t_catch_body) scm_c_eval_string, s,
-+                                   (scm_t_catch_handler) TeXmacs_lazy_catcher,
-+                                   s, 0);
-+#endif
- }
- #endif
- 
- static SCM
- TeXmacs_eval_string (char *s) {
- #ifndef DEBUG_ON
-+#if (defined(GUILE_A) || defined(GUILE_B))
-   return scm_internal_catch (SCM_BOOL_T,
-                              (scm_t_catch_body) TeXmacs_lazy_eval_string, s,
-                              (scm_t_catch_handler) TeXmacs_catcher, s);
- #else
-+  return scm_c_catch (SCM_BOOL_T,
-+                      (scm_t_catch_body) TeXmacs_lazy_eval_string, s,
-+                      (scm_t_catch_handler) TeXmacs_catcher, s, NULL, NULL);
-+
-+#endif
-+#else
-   return  scm_c_eval_string(s);
- #endif
- }
-@@ -180,19 +209,35 @@
- #ifndef DEBUG_ON
- static SCM
- TeXmacs_lazy_call_scm (arg_list* args) {
-+#if (defined(GUILE_A) || defined(GUILE_B))
-   return scm_internal_lazy_catch (SCM_BOOL_T,
-                                   (scm_t_catch_body) TeXmacs_call, (void*) args,
--                                  (scm_t_catch_handler) TeXmacs_lazy_catcher, (void*) args);
-+                                  (scm_t_catch_handler) TeXmacs_lazy_catcher,
-+                                  (void*) args);
-+#else
-+  return scm_c_with_throw_handler (SCM_BOOL_T,
-+                                   (scm_t_catch_body) TeXmacs_call, (void*) args,
-+                                   (scm_t_catch_handler) TeXmacs_lazy_catcher,
-+                                   (void*) args, 0);
-+
-+#endif
- }
- #endif
- 
- static SCM
- TeXmacs_call_scm (arg_list *args) {
- #ifndef DEBUG_ON
-+#if (defined(GUILE_A) || defined(GUILE_B))
-   return scm_internal_catch (SCM_BOOL_T,
-                              (scm_t_catch_body) TeXmacs_lazy_call_scm, (void*) args,
-                              (scm_t_catch_handler) TeXmacs_catcher, (void*) args);
- #else
-+  return scm_c_catch (SCM_BOOL_T,
-+                      (scm_t_catch_body) TeXmacs_lazy_call_scm, (void*) args,
-+                      (scm_t_catch_handler) TeXmacs_catcher, (void*) args,
-+                      NULL, NULL);
-+#endif
-+#else
-   return TeXmacs_call(args);
- #endif
- }
-@@ -443,7 +488,11 @@
-   return SCM_BOOL_F;
- }
- 
-+#ifdef GUILE_A
- static scm_sizet
-+#else
-+static size_t
-+#endif
- free_blackbox (SCM blackbox_smob) {
-   blackbox *ptr = (blackbox *) SCM_CDR (blackbox_smob);
- #ifdef DEBUG_ON
-diff -Naruw TeXmacs-1.99.9-src.orig/src/Scheme/Guile/guile_tm.hpp TeXmacs-1.99.9-src/src/Scheme/Guile/guile_tm.hpp
---- TeXmacs-1.99.9-src.orig/src/Scheme/Guile/guile_tm.hpp	2018-06-28 04:13:37.000000000 -0400
-+++ TeXmacs-1.99.9-src/src/Scheme/Guile/guile_tm.hpp	2019-06-02 17:13:22.220571381 -0400
-@@ -83,8 +83,8 @@
- #define scm_is_double scm_is_real
- #define scm_new_procedure(name,r,a,b,c) scm_c_define_gsubr(name,a,b,c,(scm_t_subr)r)
- #define scm_lookup_string(name) scm_variable_ref(scm_c_lookup(name))
--#define scm_long2scm scm_long2num
--#define scm_scm2long(x) scm_num2long(x,SCM_ARG1,"scm2long")
-+#define scm_long2scm scm_from_long
-+#define scm_scm2long(x) scm_to_long(x,SCM_ARG1,"scm2long")
- #define scm_double2scm scm_from_double
- #define scm_scm2double scm_to_double
- #define scm_str2scm scm_from_locale_stringn
-@@ -103,8 +103,8 @@
- #define scm_is_double scm_is_real
- #define scm_new_procedure(name,r,a,b,c) scm_c_define_gsubr(name,a,b,c,r)
- #define scm_lookup_string(name) scm_variable_ref(scm_c_lookup(name))
--#define scm_long2scm scm_long2num
--#define scm_scm2long(x) scm_num2long(x,SCM_ARG1,"scm2long")
-+#define scm_long2scm scm_from_long
-+#define scm_scm2long(x) scm_to_long(x,SCM_ARG1,"scm2long")
- #define scm_double2scm scm_from_double
- #define scm_scm2double scm_to_double
- #define scm_str2scm scm_from_locale_stringn
-diff -Naruw TeXmacs-1.99.9-src.orig/src/Scheme/Tiny/tinyscheme_tm.cpp TeXmacs-1.99.9-src/src/Scheme/Tiny/tinyscheme_tm.cpp
---- TeXmacs-1.99.9-src.orig/src/Scheme/Tiny/tinyscheme_tm.cpp	2017-09-28 09:44:11.000000000 -0400
-+++ TeXmacs-1.99.9-src/src/Scheme/Tiny/tinyscheme_tm.cpp	2019-06-02 17:13:27.543889585 -0400
-@@ -139,22 +139,6 @@
- /******************************************************************************
-  * Evaluation of files
-  ******************************************************************************/
--#if 0
--static scm
--TeXmacs_lazy_eval_file (char *file) {
--	
--	return scm_internal_lazy_catch (scm_BOOL_T,
--									(scm_t_catch_body) scm_c_primitive_load, file,
--									(scm_t_catch_handler) TeXmacs_lazy_catcher, file);
--}
--
--static scm
--TeXmacs_eval_file (char *file) {
--	return scm_internal_catch (scm_BOOL_T,
--							   (scm_t_catch_body) TeXmacs_lazy_eval_file, file,
--							   (scm_t_catch_handler) TeXmacs_catcher, file);
--}
--#endif 
- scm
- eval_scheme_file (string file) {
- 	//static int cumul= 0;
-@@ -172,21 +156,6 @@
- /******************************************************************************
-  * Evaluation of strings
-  ******************************************************************************/
--#if 0
--static scm
--TeXmacs_lazy_eval_string (char *s) {
--	return scm_internal_lazy_catch (scm_BOOL_T,
--									(scm_t_catch_body) scm_c_eval_string, s,
--									(scm_t_catch_handler) TeXmacs_lazy_catcher, s);
--}
--
--static scm
--TeXmacs_eval_string (char *s) {
--	return scm_internal_catch (scm_BOOL_T,
--							   (scm_t_catch_body) TeXmacs_lazy_eval_string, s,
--							   (scm_t_catch_handler) TeXmacs_catcher, s);
--}
--#endif
- scm
- eval_scheme (string s) {
- 	// cout << "Eval] " << s << "\n";
-@@ -214,21 +183,7 @@
- 		}
- 	}
- }
--#if 0
--static scm
--TeXmacs_lazy_call_scm (arg_list* args) {
--	return scm_internal_lazy_catch (scm_BOOL_T,
--									(scm_t_catch_body) TeXmacs_call, (void*) args,
--									(scm_t_catch_handler) TeXmacs_lazy_catcher, (void*) args);
--}
- 
--static scm
--TeXmacs_call_scm (arg_list *args) {
--	return scm_internal_catch (scm_BOOL_T,
--							   (scm_t_catch_body) TeXmacs_lazy_call_scm, (void*) args,
--							   (scm_t_catch_handler) TeXmacs_catcher, (void*) args);
--}
--#endif
- scm
- call_scheme (scm fun) {
- 	scm a[]= { fun }; arg_list args= { 0, a };

diff --git a/app-office/texmacs/texmacs-1.99.11.ebuild b/app-office/texmacs/texmacs-2.1.ebuild
similarity index 65%
rename from app-office/texmacs/texmacs-1.99.11.ebuild
rename to app-office/texmacs/texmacs-2.1.ebuild
index f2326cb3e65..e0775e24248 100644
--- a/app-office/texmacs/texmacs-1.99.11.ebuild
+++ b/app-office/texmacs/texmacs-2.1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-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"
+SRC_URI="http://www.texmacs.org/Download/ftp/tmftp/source/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -33,30 +33,17 @@ RDEPEND="
 	spell? ( app-text/aspell )
 	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
 "
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
+DEPEND="${RDEPEND}"
+BDEPEND="x11-base/xorg-proto"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.99.2-desktop.patch
-
-	# remove new/delete declarations, bug 590002
-	"${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch
-
-	"${FILESDIR}"/${PN}-1.99.6-math_util.patch
-
-	# fix build failure on 32-bit systems, bug #652054
-	#	"${FILESDIR}"/${PN}-1.99.6-guile-size_t.patch
-	#"${FILESDIR}"/${PN}-1.99.9-guile-remove-deprecated.patch
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DUSE_SQLITE3=$(usex sqlite 1 0)
 		-DDEBUG_ASSERT=$(usex debug 1 0)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-07-21 15:39 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-15 14:52 [gentoo-commits] repo/gentoo:master commit in: app-office/texmacs/files/, app-office/texmacs/ Sergei Trofimovich
  -- strict thread matches above, loose matches on Subject: below --
2021-07-21 15:39 Marek Szuba
2020-10-23 12:34 Andreas Sturmlechner
2018-05-06 20:18 Andreas Sturmlechner
2016-07-31 11:32 David Seifert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox