Merge updates from master
This commit is contained in:
commit
35581829fc
|
@ -4,7 +4,7 @@
|
|||
# @ECLASS: wxwidgets.eclass
|
||||
# @MAINTAINER:
|
||||
# wxwidgets@gentoo.org
|
||||
# @SUPPORTED_EAPIS: 7
|
||||
# @SUPPORTED_EAPIS: 7 8
|
||||
# @BLURB: Manages build configuration for wxGTK-using packages.
|
||||
# @DESCRIPTION:
|
||||
# This eclass sets up the proper environment for ebuilds using the wxGTK
|
||||
|
@ -21,10 +21,9 @@
|
|||
# The configuration chosen is based on the version required and the flags
|
||||
# wxGTK was built with.
|
||||
|
||||
case ${EAPI:-0} in
|
||||
[0-6]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;;
|
||||
7) ;;
|
||||
*) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
|
||||
case ${EAPI} in
|
||||
7|8) ;;
|
||||
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
|
||||
esac
|
||||
|
||||
if [[ -z ${_WXWIDGETS_ECLASS} ]]; then
|
||||
|
@ -37,9 +36,14 @@ _WXWIDGETS_ECLASS=1
|
|||
# The SLOT of the x11-libs/wxGTK you're targeting. Needs to be defined before
|
||||
# inheriting the eclass. Can be either "3.0" or "3.0-gtk3".
|
||||
case ${WX_GTK_VER} in
|
||||
3.0|3.0-gtk3) ;;
|
||||
"") die "WX_GTK_VER not declared" ;;
|
||||
*) die "Invalid WX_GTK_VER: must be set to a valid wxGTK SLOT ('3.0' or '3.0-gtk3')" ;;
|
||||
3.0-gtk3) ;;
|
||||
3.0)
|
||||
if [[ ${EAPI} != 7 ]]; then
|
||||
die "${ECLASS}: GTK 2 no longer supported in EAPI ${EAPI}"
|
||||
fi
|
||||
;;
|
||||
"") die "WX_GTK_VER not declared" ;;
|
||||
*) die "Invalid WX_GTK_VER: must be set to a valid wxGTK SLOT ('3.0' or '3.0-gtk3')" ;;
|
||||
esac
|
||||
readonly WX_GTK_VER
|
||||
|
||||
|
|
|
@ -1 +1,2 @@
|
|||
DIST gnuplot-5.4.1.tar.gz 5608076 BLAKE2B 7b2c30acd16b1aec3be9341c019449882a9231afe196bb05dc5d7925681296986de2be3463ca19d62ff1cea6dece0586b6bc8a54881c4fc2ec372635264ebb3d SHA512 2371830636d4c9ee93e9d6566dc2889e96ece3660b63ef4cfb6514e233510e5abaf4f93863bbe9a418f11db8e3b12a15242556aae52bb69591ad7d26e6581121
|
||||
DIST gnuplot-5.4.2.tar.gz 5640202 BLAKE2B 42bdbe569a4dcd9e65010aff3d0b7428f1c3485bc64429ac0f2c4f157d43c4d640aa2b191430428ec01cb289bd1d43eb95b4167b5b9d236002d54e48b45c0a2a SHA512 e69ca74335cdd69c6013a254ac785dc67cc82713308460971cf6e0a66438716d8892a37344611d1841563efbc4b2b8c5692c13c7b06cff4f30f8d43e2ddfd7d4
|
||||
|
|
|
@ -0,0 +1,18 @@
|
|||
Do not require picins.sty.
|
||||
https://bugs.gentoo.org/577828#c4
|
||||
|
||||
--- gnuplot/docs/Makefile.am
|
||||
+++ gnuplot/docs/Makefile.am
|
||||
@@ -179,9 +179,10 @@
|
||||
$(AM_V_at)GNUPLOT_LIB=$(top_srcdir)/demo $(GNUPLOT_EXE) $(srcdir)/plotstyles.gnu
|
||||
rm -f gpinsetfigure.tex ; \
|
||||
( echo "\usepackage{graphicx}" > gpinsetfigure.tex ; \
|
||||
- echo "\usepackage{picins}" >> gpinsetfigure.tex ; \
|
||||
echo "\newcommand{\gpinsetfigure}[1]{" >> gpinsetfigure.tex ; \
|
||||
- echo " \parpic[r][rt]{\includegraphics[width=3in,keepaspectratio]{#1}}" >> gpinsetfigure.tex ; \
|
||||
+ echo " \begin{figure}[htb]" >> gpinsetfigure.tex ; \
|
||||
+ echo " \centering\includegraphics[width=3in,keepaspectratio]{#1}" >> gpinsetfigure.tex ; \
|
||||
+ echo " \end{figure}" >> gpinsetfigure.tex ; \
|
||||
echo "}" >> gpinsetfigure.tex ; \
|
||||
) ; \
|
||||
$(AM_V_GEN)touch $@
|
|
@ -0,0 +1,206 @@
|
|||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
LUA_COMPAT=( lua5-{1,2,3,4} )
|
||||
WX_GTK_VER="3.0-gtk3"
|
||||
|
||||
inherit autotools flag-o-matic lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
|
||||
|
||||
DESCRIPTION="Command-line driven interactive plotting program"
|
||||
HOMEPAGE="http://www.gnuplot.info/"
|
||||
|
||||
if [[ -z ${PV%%*9999} ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main"
|
||||
EGIT_BRANCH="master"
|
||||
MY_P="${PN}"
|
||||
EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}"
|
||||
else
|
||||
MY_P="${P/_/.}"
|
||||
SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
LICENSE="gnuplot"
|
||||
SLOT="0"
|
||||
IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X"
|
||||
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
|
||||
|
||||
RDEPEND="
|
||||
cairo? (
|
||||
x11-libs/cairo
|
||||
x11-libs/pango )
|
||||
gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
|
||||
ggi? ( media-libs/libggi )
|
||||
latex? (
|
||||
virtual/latex-base
|
||||
lua? (
|
||||
dev-tex/pgf
|
||||
>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
|
||||
libcaca? ( media-libs/libcaca )
|
||||
lua? ( ${LUA_DEPS} )
|
||||
qt5? (
|
||||
dev-qt/qtcore:5=
|
||||
dev-qt/qtgui:5=
|
||||
dev-qt/qtnetwork:5=
|
||||
dev-qt/qtprintsupport:5=
|
||||
dev-qt/qtsvg:5=
|
||||
dev-qt/qtwidgets:5= )
|
||||
readline? ( sys-libs/readline:0= )
|
||||
libcerf? ( sci-libs/libcerf )
|
||||
wxwidgets? (
|
||||
x11-libs/wxGTK:${WX_GTK_VER}[X]
|
||||
x11-libs/cairo
|
||||
x11-libs/pango
|
||||
x11-libs/gtk+:3 )
|
||||
X? ( x11-libs/libXaw )"
|
||||
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
doc? (
|
||||
virtual/latex-base
|
||||
dev-texlive/texlive-latexextra
|
||||
dev-texlive/texlive-langgreek
|
||||
app-text/ghostscript-gpl )
|
||||
qt5? ( dev-qt/linguist-tools:5 )"
|
||||
|
||||
IDEPEND="latex? ( virtual/latex-base )"
|
||||
|
||||
GP_VERSION="${PV%.*}"
|
||||
TEXMF="${EPREFIX}/usr/share/texmf-site"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
use lua && lua-single_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
if [[ ${PV##*.} = 9999 ]]; then
|
||||
local dir
|
||||
for dir in config demo m4 term tutorial; do
|
||||
emake -C "$dir" -f Makefile.am.in Makefile.am
|
||||
done
|
||||
fi
|
||||
|
||||
# Add special version identification as required by provision 2
|
||||
# of the gnuplot license
|
||||
sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
|
||||
|
||||
eautoreconf
|
||||
|
||||
# Make sure we don't mix build & host flags.
|
||||
sed -i \
|
||||
-e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \
|
||||
-e 's:@CFLAGS@:$(BUILD_CFLAGS):' \
|
||||
-e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \
|
||||
-e 's:@CC@:$(CC_FOR_BUILD):' \
|
||||
docs/Makefile.in || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
if ! use latex; then
|
||||
sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
|
||||
fi
|
||||
|
||||
use wxwidgets && setup-wxwidgets
|
||||
|
||||
tc-export CC CXX #453174
|
||||
tc-export_build_env BUILD_CC
|
||||
export CC_FOR_BUILD=${BUILD_CC}
|
||||
|
||||
econf \
|
||||
--with-texdir="${TEXMF}/tex/latex/${PN}" \
|
||||
--with-readline=$(usex readline gnu builtin) \
|
||||
$(use_with bitmap bitmap-terminals) \
|
||||
$(use_with cairo) \
|
||||
$(use_with gd) \
|
||||
"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
|
||||
"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
|
||||
$(use_with libcerf) \
|
||||
$(use_with lua) \
|
||||
$(use_with regis) \
|
||||
$(use_with X x) \
|
||||
--enable-stats \
|
||||
$(use_with qt5 qt qt5) \
|
||||
$(use_enable wxwidgets) \
|
||||
DIST_CONTACT="https://bugs.gentoo.org/" \
|
||||
EMACS=no
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Prevent access violations, see bug 201871
|
||||
export VARTEXFONTS="${T}/fonts"
|
||||
|
||||
emake all
|
||||
|
||||
if use doc; then
|
||||
# Avoid sandbox violation in epstopdf/ghostscript
|
||||
addpredict /var/cache/fontconfig
|
||||
if use cairo; then
|
||||
emake -C docs pdf
|
||||
else
|
||||
ewarn "Cannot build figures unless cairo is enabled."
|
||||
ewarn "Building documentation without figures."
|
||||
emake -C docs pdf_nofig
|
||||
mv docs/nofigures.pdf docs/gnuplot.pdf || die
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES
|
||||
newdoc term/PostScript/README README-ps
|
||||
newdoc term/js/README README-js
|
||||
use lua && newdoc term/lua/README README-lua
|
||||
|
||||
local DOC_CONTENTS='Gnuplot no longer links against pdflib. You can
|
||||
use the "pdfcairo" terminal for PDF output.'
|
||||
use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
|
||||
use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
|
||||
you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
|
||||
environment variables. See the FAQ file in /usr/share/doc/${PF}/
|
||||
for more information."
|
||||
readme.gentoo_create_doc
|
||||
|
||||
if use examples; then
|
||||
# Demo files
|
||||
insinto /usr/share/${PN}/${GP_VERSION}
|
||||
doins -r demo
|
||||
rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary{1,2,3} || die
|
||||
rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/plugin/*.{o,so} || die
|
||||
fi
|
||||
|
||||
if use doc; then
|
||||
# Manual, FAQ
|
||||
dodoc docs/gnuplot.pdf FAQ.pdf
|
||||
# Documentation for making PostScript files
|
||||
docinto psdoc
|
||||
dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake check GNUTERM="dumb"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use latex && texmf-update
|
||||
readme.gentoo_print_elog
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use latex && texmf-update
|
||||
}
|
|
@ -1,9 +1,9 @@
|
|||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
LUA_COMPAT=( lua5-{1,2,3} )
|
||||
LUA_COMPAT=( lua5-{1,2,3,4} )
|
||||
WX_GTK_VER="3.0-gtk3"
|
||||
|
||||
inherit autotools flag-o-matic lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
|
||||
|
@ -70,13 +70,13 @@ BDEPEND="
|
|||
app-text/ghostscript-gpl )
|
||||
qt5? ( dev-qt/linguist-tools:5 )"
|
||||
|
||||
IDEPEND="latex? ( virtual/latex-base )"
|
||||
|
||||
GP_VERSION="${PV%.*}"
|
||||
E_SITEFILE="lisp/50${PN}-gentoo.el"
|
||||
TEXMF="${EPREFIX}/usr/share/texmf-site"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
|
||||
"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
|
||||
"${FILESDIR}"/${PN}-5.5-no-picins.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
|
|
Loading…
Reference in New Issue