commit: cf00950c7689d1358698606820aa6dde43882a5f
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 4 12:27:43 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Nov 4 12:34:00 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf00950c
app-text/openjade: Bump EAPI
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
app-text/openjade/files/openjade-1.3.2-chmod.patch | 4 +-
.../files/openjade-1.3.2-no-undefined.patch | 4 +-
.../files/openjade-1.3.2-wchar_t-uint.patch | 4 +-
app-text/openjade/openjade-1.3.2-r7.ebuild | 53 ++++++++++++----------
app-text/openjade/openjade-1.3.2-r8.ebuild | 32 ++++++-------
5 files changed, 50 insertions(+), 47 deletions(-)
diff --git a/app-text/openjade/files/openjade-1.3.2-chmod.patch
b/app-text/openjade/files/openjade-1.3.2-chmod.patch
index bafc798f111..ca8abbd50da 100644
--- a/app-text/openjade/files/openjade-1.3.2-chmod.patch
+++ b/app-text/openjade/files/openjade-1.3.2-chmod.patch
@@ -1,5 +1,5 @@
---- Makefile.comm.in.orig 2017-07-11 20:14:20.459014115 +0700
-+++ Makefile.comm.in 2017-07-11 20:14:31.724715876 +0700
+--- a/Makefile.comm.in.orig 2017-07-11 20:14:20.459014115 +0700
++++ b/Makefile.comm.in 2017-07-11 20:14:31.724715876 +0700
@@ -53,7 +53,7 @@
.m4.cxx:
rm -f $@
diff --git a/app-text/openjade/files/openjade-1.3.2-no-undefined.patch
b/app-text/openjade/files/openjade-1.3.2-no-undefined.patch
index 1b298f88a6f..4e5aefc3a86 100644
--- a/app-text/openjade/files/openjade-1.3.2-no-undefined.patch
+++ b/app-text/openjade/files/openjade-1.3.2-no-undefined.patch
@@ -1,5 +1,5 @@
---- Makefile.lib.in.orig 2016-05-19 17:20:25.164931700 +0200
-+++ Makefile.lib.in 2016-05-19 17:20:56.539989400 +0200
+--- a/Makefile.lib.in.orig 2016-05-19 17:20:25.164931700 +0200
++++ b/Makefile.lib.in 2016-05-19 17:20:56.539989400 +0200
@@ -24,7 +24,7 @@
lib$(LIB).la: $(LT_OBJS)
diff --git a/app-text/openjade/files/openjade-1.3.2-wchar_t-uint.patch
b/app-text/openjade/files/openjade-1.3.2-wchar_t-uint.patch
index 62dcb02cd2e..920cff248d6 100644
--- a/app-text/openjade/files/openjade-1.3.2-wchar_t-uint.patch
+++ b/app-text/openjade/files/openjade-1.3.2-wchar_t-uint.patch
@@ -1,7 +1,7 @@
This fixes Cygwin, where wchar_t is ushort.
---- grove/Node.h
-+++ grove/Node.h
+--- a/grove/Node.h
++++ b/grove/Node.h
@@ -8,6 +8,7 @@
#endif
diff --git a/app-text/openjade/openjade-1.3.2-r7.ebuild
b/app-text/openjade/openjade-1.3.2-r7.ebuild
index 15297e07904..95ece1c5ef2 100644
--- a/app-text/openjade/openjade-1.3.2-r7.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r7.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5 # sgml-catalog inherits base, banned in 6
-
-inherit autotools sgml-catalog eutils flag-o-matic multilib toolchain-funcs
+EAPI=7
+inherit autotools sgml-catalog flag-o-matic toolchain-funcs
DESCRIPTION="Jade is an implementation of DSSSL for formatting SGML and XML
documents"
HOMEPAGE="http://openjade.sourceforge.net";
@@ -14,20 +13,26 @@ SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
-RDEPEND="app-text/sgml-common
- >=app-text/opensp-1.5.1"
-DEPEND="dev-lang/perl
- ${RDEPEND}"
+RDEPEND="
+ app-text/sgml-common
+ >=app-text/opensp-1.5.1
+"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+"
src_prepare() {
- epatch "${FILESDIR}"/${P}-deplibs.patch
- epatch "${FILESDIR}"/${P}-ldflags.patch
- epatch "${FILESDIR}"/${P}-msggen.pl.patch
- epatch "${FILESDIR}"/${P}-respect-ldflags.patch
- epatch "${FILESDIR}"/${P}-libosp-la.patch
- epatch "${FILESDIR}"/${P}-gcc46.patch
- epatch "${FILESDIR}"/${P}-no-undefined.patch
- epatch "${FILESDIR}"/${P}-wchar_t-uint.patch
+ default
+
+ eapply "${FILESDIR}"/${P}-deplibs.patch
+ eapply "${FILESDIR}"/${P}-ldflags.patch
+ eapply "${FILESDIR}"/${P}-msggen.pl.patch
+ eapply "${FILESDIR}"/${P}-respect-ldflags.patch
+ eapply "${FILESDIR}"/${P}-libosp-la.patch
+ eapply "${FILESDIR}"/${P}-gcc46.patch
+ eapply "${FILESDIR}"/${P}-no-undefined.patch
+ eapply "${FILESDIR}"/${P}-wchar_t-uint.patch
+ eapply "${FILESDIR}"/${P}-chmod.patch #487218
# Please note! Opts are disabled. If you know what you're doing
# feel free to remove this line. It may cause problems with
@@ -68,9 +73,7 @@ src_configure() {
}
src_compile() {
- # Bug 412725.
- unset INCLUDE
-
+ unset INCLUDE #412725
emake -j1 SHELL="${BASH}"
}
@@ -82,7 +85,7 @@ src_install() {
libdir="${EPREFIX}"/usr/$(get_libdir) \
install install-man
- prune_libtool_files
+ use static-libs || find "${D}" -name '*.la' -delete || die
dosym openjade /usr/bin/jade
dosym onsgmls /usr/bin/nsgmls
@@ -98,14 +101,14 @@ src_install() {
insinto /usr/share/sgml/${P}/dsssl
doins dsssl/{dsssl.dtd,style-sheet.dtd,fot.dtd}
newins "${FILESDIR}"/${P}.dsssl-catalog catalog
-# Breaks sgml2xml among other things
-# insinto /usr/share/sgml/${P}/unicode
-# doins unicode/{catalog,unicode.sd,unicode.syn,gensyntax.pl}
+
+ # Breaks sgml2xml among other things
+ #insinto /usr/share/sgml/${P}/unicode
+ #doins unicode/{catalog,unicode.sd,unicode.syn,gensyntax.pl}
insinto /usr/share/sgml/${P}/pubtext
doins pubtext/*
- dodoc NEWS README VERSION
- dohtml doc/*.htm
+ HTML_DOCS="doc/*.htm" einstalldocs
insinto /usr/share/doc/${PF}/jadedoc
doins jadedoc/*.htm
diff --git a/app-text/openjade/openjade-1.3.2-r8.ebuild
b/app-text/openjade/openjade-1.3.2-r8.ebuild
index 5ffa1d2ee20..af2595cbebd 100644
--- a/app-text/openjade/openjade-1.3.2-r8.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r8.ebuild
@@ -1,9 +1,8 @@
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5 # sgml-catalog inherits base, banned in 6
-
-inherit autotools sgml-catalog epatch flag-o-matic multilib toolchain-funcs
+EAPI=7
+inherit autotools sgml-catalog flag-o-matic toolchain-funcs
DESCRIPTION="Jade is an implementation of DSSSL for formatting SGML and XML
documents"
HOMEPAGE="http://openjade.sourceforge.net";
@@ -18,20 +17,22 @@ RDEPEND="
app-text/sgml-common
>=app-text/opensp-1.5.1
"
-DEPEND="dev-lang/perl
- ${RDEPEND}
+DEPEND="${RDEPEND}
+ dev-lang/perl
"
src_prepare() {
- epatch "${FILESDIR}"/${P}-deplibs.patch
- epatch "${FILESDIR}"/${P}-ldflags.patch
- epatch "${FILESDIR}"/${P}-msggen.pl.patch
- epatch "${FILESDIR}"/${P}-respect-ldflags.patch
- epatch "${FILESDIR}"/${P}-libosp-la.patch
- epatch "${FILESDIR}"/${P}-gcc46.patch
- epatch "${FILESDIR}"/${P}-no-undefined.patch
- epatch "${FILESDIR}"/${P}-wchar_t-uint.patch
- epatch "${FILESDIR}"/${P}-chmod.patch #487218
+ default
+
+ eapply "${FILESDIR}"/${P}-deplibs.patch
+ eapply "${FILESDIR}"/${P}-ldflags.patch
+ eapply "${FILESDIR}"/${P}-msggen.pl.patch
+ eapply "${FILESDIR}"/${P}-respect-ldflags.patch
+ eapply "${FILESDIR}"/${P}-libosp-la.patch
+ eapply "${FILESDIR}"/${P}-gcc46.patch
+ eapply "${FILESDIR}"/${P}-no-undefined.patch
+ eapply "${FILESDIR}"/${P}-wchar_t-uint.patch
+ eapply "${FILESDIR}"/${P}-chmod.patch #487218
# Please note! Opts are disabled. If you know what you're doing
# feel free to remove this line. It may cause problems with
@@ -107,8 +108,7 @@ src_install() {
insinto /usr/share/sgml/${P}/pubtext
doins pubtext/*
- dodoc NEWS README VERSION
- dohtml doc/*.htm
+ HTML_DOCS="doc/*.htm" einstalldocs
insinto /usr/share/doc/${PF}/jadedoc
doins jadedoc/*.htm
