* [gentoo-commits] repo/gentoo:master commit in: app-text/openjade/files/, app-text/openjade/
@ 2018-11-04 12:34 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2018-11-04 12:34 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/openjade/files/, app-text/openjade/
@ 2018-11-04 12:34 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2018-11-04 12:34 UTC (permalink / raw
To: gentoo-commits
commit: 9da392dacc955589bf68ceb1d46188aaa9e614e6
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 4 12:19:23 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Nov 4 12:33:57 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9da392da
app-text/openjade: Fix chmod call
Thanks-to: Pavel Goran
Closes: https://bugs.gentoo.org/487218
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 | 11 ++
app-text/openjade/openjade-1.3.2-r8.ebuild | 124 +++++++++++++++++++++
2 files changed, 135 insertions(+)
diff --git a/app-text/openjade/files/openjade-1.3.2-chmod.patch b/app-text/openjade/files/openjade-1.3.2-chmod.patch
new file mode 100644
index 00000000000..bafc798f111
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-chmod.patch
@@ -0,0 +1,11 @@
+--- Makefile.comm.in.orig 2017-07-11 20:14:20.459014115 +0700
++++ Makefile.comm.in 2017-07-11 20:14:31.724715876 +0700
+@@ -53,7 +53,7 @@
+ .m4.cxx:
+ rm -f $@
+ $(PERL) $(srcdir)/../instmac.pl $< >$@
+- chmod -w $@
++ chmod a-w $@
+
+ %.h %.cxx %.rc: %.msg
+ $(PERL) -w $(srcdir)/../msggen.pl $(MSGGENFLAGS) $<
diff --git a/app-text/openjade/openjade-1.3.2-r8.ebuild b/app-text/openjade/openjade-1.3.2-r8.ebuild
new file mode 100644
index 00000000000..5ffa1d2ee20
--- /dev/null
+++ b/app-text/openjade/openjade-1.3.2-r8.ebuild
@@ -0,0 +1,124 @@
+# 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
+
+DESCRIPTION="Jade is an implementation of DSSSL for formatting SGML and XML documents"
+HOMEPAGE="http://openjade.sourceforge.net"
+SRC_URI="mirror://sourceforge/openjade/${P}.tar.gz"
+
+LICENSE="MIT"
+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}
+"
+
+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
+
+ # Please note! Opts are disabled. If you know what you're doing
+ # feel free to remove this line. It may cause problems with
+ # docbook-sgml-utils among other things.
+ #ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
+ strip-flags
+
+ # Default CFLAGS and CXXFLAGS is -O2 but this make openjade segfault
+ # on hppa. Using -O1 works fine. So I force it here.
+ use hppa && replace-flags -O2 -O1
+
+ ln -s config/configure.in configure.ac || die
+ cp "${FILESDIR}"/${P}-acinclude.m4 acinclude.m4 || die
+ rm config/missing || die
+
+ AT_NOEAUTOMAKE=yes
+ eautoreconf
+
+ SGML_PREFIX="${EPREFIX}"/usr/share/sgml
+}
+
+src_configure() {
+ # avoids dead-store elimination optimization
+ # leading to segfaults on GCC 6
+ # bug #592590 #596506
+ tc-is-clang || append-cxxflags $(test-flags-CXX -fno-lifetime-dse)
+
+ # We need Prefix env, bug #287358
+ export CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}"
+ econf \
+ --enable-http \
+ --enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \
+ --enable-default-search-path="${EPREFIX}"/usr/share/sgml \
+ --enable-splibdir="${EPREFIX}"/usr/$(get_libdir) \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --datadir="${EPREFIX}"/usr/share/sgml/${P} \
+ $(use_enable static-libs static)
+}
+
+src_compile() {
+ unset INCLUDE #412725
+ emake -j1 SHELL="${BASH}"
+}
+
+src_install() {
+ insinto /usr/$(get_libdir)
+
+ make DESTDIR="${D}" \
+ SHELL="${BASH}" \
+ libdir="${EPREFIX}"/usr/$(get_libdir) \
+ install install-man
+
+ use static-libs || find "${D}" -name '*.la' -delete || die
+
+ dosym openjade /usr/bin/jade
+ dosym onsgmls /usr/bin/nsgmls
+ dosym osgmlnorm /usr/bin/sgmlnorm
+ dosym ospam /usr/bin/spam
+ dosym ospent /usr/bin/spent
+ dosym osx /usr/bin/sgml2xml
+
+ insinto /usr/share/sgml/${P}/
+ doins dsssl/builtins.dsl
+
+ echo 'SYSTEM "builtins.dsl" "builtins.dsl"' > ${ED}/usr/share/sgml/${P}/catalog
+ 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}
+ insinto /usr/share/sgml/${P}/pubtext
+ doins pubtext/*
+
+ dodoc NEWS README VERSION
+ dohtml doc/*.htm
+
+ insinto /usr/share/doc/${PF}/jadedoc
+ doins jadedoc/*.htm
+ insinto /usr/share/doc/${PF}/jadedoc/images
+ doins jadedoc/images/*
+}
+
+sgml-catalog_cat_include "/etc/sgml/${P}.cat" \
+ "/usr/share/sgml/openjade-${PV}/catalog"
+sgml-catalog_cat_include "/etc/sgml/${P}.cat" \
+ "/usr/share/sgml/openjade-${PV}/dsssl/catalog"
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook.cat" \
+ "/etc/sgml/${P}.cat"
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-11-04 12:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-04 12:34 [gentoo-commits] repo/gentoo:master commit in: app-text/openjade/files/, app-text/openjade/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2018-11-04 12:34 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox