From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- media-gfx/graphviz/Manifest | 6 +- .../files/graphviz-2.42.1-libgv_python.patch | 15 -- .../graphviz/files/graphviz-2.42.1-math.patch | 38 --- media-gfx/graphviz/graphviz-2.42.1-r1.ebuild | 277 --------------------- media-gfx/graphviz/graphviz-2.42.3.ebuild | 6 +- 5 files changed, 4 insertions(+), 338 deletions(-) delete mode 100644 media-gfx/graphviz/files/graphviz-2.42.1-libgv_python.patch delete mode 100644 media-gfx/graphviz/files/graphviz-2.42.1-math.patch delete mode 100644 media-gfx/graphviz/graphviz-2.42.1-r1.ebuild (limited to 'media-gfx/graphviz') diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest index 12dacc76d7e1..f0c8a3eb1bd7 100644 --- a/media-gfx/graphviz/Manifest +++ b/media-gfx/graphviz/Manifest @@ -1,8 +1,4 @@ AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0b4b0c8f596ca9d2c2f516961f5baab9fd54ba870df75434d2ed59fd9034bb7e2ce38c00faef9c12a79c7ec4da2d5e416d7117 SHA512 473d2ed9070329512cbc26929267b25fb8d7726e21ed01d2921d4d8ac13b8ffaf166f07229fa7409192cfa14fabb0cf68b299bb3331b3cc953ae5363274fd15c -AUX graphviz-2.42.1-libgv_python.patch 621 BLAKE2B fa1d3e0f37870c46d8e6266ac812691f2f2bc8a0cdfaa6e4183da2f46714f8621d14578cc8f4dbf7a96e276f272822dd447d61145133d5d47a9c6ae686e24439 SHA512 637c344698cbfd7f698f5615fd04644bb5b704761dccaf9abd4fa98b9b60e1572cd3f2b8af4ae46ce3aa7b57cd1a633b781d1642d4ee0c97c5812f38719f8a37 -AUX graphviz-2.42.1-math.patch 843 BLAKE2B 3ceeeec968dd45478f4bb07d819cb5a4b5a215c36728dd9212db9a81841ad4ffcc1c02a56b850fb9cfde0de3689eb595eb1f73feb97c11e77d0fdfea5e708127 SHA512 17494f6795b4ed8cdef8652089132243808acd76fe970a6297cb93907cd15ad91460dbffd5ab3251d8c84a4e0ca0ec4cc96268682ef93f4b5f6b1dc88bb0b64d -DIST graphviz-2.42.1.tar.gz 25543401 BLAKE2B e64044923a823f6fbe91b498b04fffe3e5b6803c55c5ce29a60b16a38d97260061b013e8bd13bc99f360d035c840f18a01301b29ca1cb73c4be87843f18c45fc SHA512 ac263df086eea6faf682f493756b79a0af8bae3f515cd8c09238e89f295226baf743a3fd22d977ef6f223388769ef11241dfb2fdb6087305ce4fdd3fa8ed2f78 DIST graphviz-2.42.3.tar.gz 26246717 BLAKE2B 71c61dcd056c9a2e2655c3be995d1da17b3af0d3374e74400fc38da11ab81849f7b5e528f99fc2046294958a4bab0a411ab204e434360f316a5367403472e8a1 SHA512 e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9 -EBUILD graphviz-2.42.1-r1.ebuild 7935 BLAKE2B 1ac923f722297c1c12e5a8c38ced5b5568c76267be5be645503f64cc3977d1b352083edbeda259a05aad67ace7268906e55d3103c4aa456b27d6ce2cc66c9acb SHA512 7b122f160d5e886a4bd9a5844040eff974d5f86774fabd6938cebe85f01a40f49799fc64ba2708b7d8f8885a2efd506a9e6d401908d5ac970fc2ebc2ade46cb3 -EBUILD graphviz-2.42.3.ebuild 7823 BLAKE2B b10b894caa51995e558f5c28c3d247ba54055d9c82133f57a4d708d84255bcb7b212c71a712a29f1c732fed7506c8cbef0d21ef55b73ca36b419a72f6ffccd21 SHA512 8652c04572d91396521bad94323d72433a4a7a82d6f0084f2efd937517d76e7e735b9050abb03344dc8f319940fdfc29f5f1b6160400c3902fd09e989bdb1107 +EBUILD graphviz-2.42.3.ebuild 7810 BLAKE2B fbd88ab7469d3c742d6683109f4dbe899cac7a40dc696d003f412b26eb3bea617abe7e32ebf8ef34d8278c6954a91143cc3fc823ca8d7c91a8ab59498eb4bdf4 SHA512 ba906c822d7b6cdd7826805a9d49fc27d032055c8923892e2d1a9f7f8223ee07170fd95f1c6e10506909c0a33bcba8e58938d6ba5f666ab2fa220ee1b587d549 MISC metadata.xml 2211 BLAKE2B 1c39235c1d8c2efce0596cda2d20bf1cf2e81643068f68215f31462b6320f7f31533877630aa3c2b2bc9a7f7856f7b27354a97bb2c61d7e63a6de86f569ed192 SHA512 f7689fe65e46905d48fb2e45c3ad2a1e8f4fcb572515fdd7dfa26cdd21ed1eaf52d8ecaab9c297f5e8df69a205337b8526e0304ddbdb8c4b3e82cb1e428a1e71 diff --git a/media-gfx/graphviz/files/graphviz-2.42.1-libgv_python.patch b/media-gfx/graphviz/files/graphviz-2.42.1-libgv_python.patch deleted file mode 100644 index 426ebbe14a3d..000000000000 --- a/media-gfx/graphviz/files/graphviz-2.42.1-libgv_python.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/tclpkg/gv/Makefile.am -+++ b/tclpkg/gv/Makefile.am -@@ -430,10 +430,10 @@ - (cd $(DESTDIR)$(pkgpythondir); rm -f _gv.so; $(LN_S) libgv_python.so _gv.so;) - endif - if WITH_PYTHON2 -- (cd $(DESTDIR)$(pkgpython2dir); rm -f _gv.so; $(LN_S) libgv_python.so _gv.so;) -+ (cd $(DESTDIR)$(pkgpython2dir); rm -f _gv.so; $(LN_S) libgv_python2.so _gv.so;) - endif - if WITH_PYTHON3 -- (cd $(DESTDIR)$(pkgpython3dir); rm -f _gv.so; $(LN_S) libgv_python.so _gv.so;) -+ (cd $(DESTDIR)$(pkgpython3dir); rm -f _gv.so; $(LN_S) libgv_python3.so _gv.so;) - endif - if WITH_R - (cd $(DESTDIR)$(pkgRdir); rm -f gv.so; $(LN_S) libgv_R.so gv.so;) diff --git a/media-gfx/graphviz/files/graphviz-2.42.1-math.patch b/media-gfx/graphviz/files/graphviz-2.42.1-math.patch deleted file mode 100644 index 59b84817a99b..000000000000 --- a/media-gfx/graphviz/files/graphviz-2.42.1-math.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/lib/sfio/sfdlen.c b/lib/sfio/sfdlen.c -index 2b4f8b0a3..3b2c75066 100644 ---- a/lib/sfio/sfdlen.c -+++ b/lib/sfio/sfdlen.c -@@ -13,6 +13,8 @@ - - #include "sfhdr.h" - -+#include -+ - /* Return the length of a double value if coded in a portable format - ** - ** Written by Kiem-Phong Vo -diff --git a/lib/sfio/sfgetd.c b/lib/sfio/sfgetd.c -index 535b2cb9a..607681e60 100644 ---- a/lib/sfio/sfgetd.c -+++ b/lib/sfio/sfgetd.c -@@ -13,6 +13,8 @@ - - #include "sfhdr.h" - -+#include -+ - /* Read a portably coded double value - ** - ** Written by Kiem-Phong Vo -diff --git a/lib/sfio/sfputd.c b/lib/sfio/sfputd.c -index 64ab9eaf3..a2dbd225c 100644 ---- a/lib/sfio/sfputd.c -+++ b/lib/sfio/sfputd.c -@@ -14,6 +14,7 @@ - #include "sfhdr.h" - - #include -+#include - - /* Write out a floating point value in a portable format - ** diff --git a/media-gfx/graphviz/graphviz-2.42.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.42.1-r1.ebuild deleted file mode 100644 index 4dac9f5771e0..000000000000 --- a/media-gfx/graphviz/graphviz-2.42.1-r1.ebuild +++ /dev/null @@ -1,277 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) -inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils - -DESCRIPTION="Open Source Graph Visualization Software" -HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/" -SRC_URI="https://www2.graphviz.org/Packages/stable/portable_source/${P}.tar.gz" - -LICENSE="CPL-1.0" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" -IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD" - -REQUIRED_USE=" - !cairo? ( !X !gtk !postscript !lasi ) - python? ( ${PYTHON_REQUIRED_USE} )" - -# Requires ksh, tests against installed package, missing files and directory -RESTRICT="test" - -COMMON_DEPEND=" - >=dev-libs/expat-2 - >=dev-libs/glib-2.11.1:2 - dev-libs/libltdl:0 - >=media-libs/fontconfig-2.3.95 - >=media-libs/freetype-2.1.10 - >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] - >=media-libs/libpng-1.2:0= - sys-libs/zlib - virtual/jpeg:0 - virtual/libiconv - cairo? ( - >=x11-libs/cairo-1.1.10[svg] - >=x11-libs/pango-1.12 - ) - devil? ( media-libs/devil[png,jpeg] ) - gtk? ( x11-libs/gtk+:2 ) - gts? ( sci-libs/gts ) - lasi? ( media-libs/lasi ) - pdf? ( app-text/poppler ) - perl? ( dev-lang/perl:= ) - postscript? ( app-text/ghostscript-gpl ) - python? ( ${PYTHON_DEPS} ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - ) - ruby? ( dev-lang/ruby:* ) - svg? ( gnome-base/librsvg ) - tcl? ( >=dev-lang/tcl-8.3:0= ) - X? ( - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXt - ) -" -DEPEND="${COMMON_DEPEND} - sys-devel/flex - sys-devel/libtool - virtual/pkgconfig - guile? ( dev-lang/swig dev-scheme/guile ) - java? ( dev-lang/swig >=virtual/jdk-1.5 ) - nls? ( >=sys-devel/gettext-0.14.5 ) - perl? ( dev-lang/swig ) - python? ( dev-lang/swig ) - ruby? ( dev-lang/swig ) - tcl? ( dev-lang/swig ) -" -RDEPEND="${COMMON_DEPEND} - !<=sci-chemistry/cluster-1.3.081231 -" - -# Dependency description / Maintainer-Info: - -# Rendering is done via the following plugins (/plugins): -# - core, dot_layout, neato_layout, gd , dot -# the ones which are always compiled in, depend on zlib, gd -# - gtk -# Directly depends on gtk-2. -# needs 'pangocairo' enabled in graphviz configuration -# gtk-2 depends on pango, cairo and libX11 directly. -# - gdk-pixbuf -# Disabled, GTK-1 junk. -# - glitz -# Disabled, no particular reason -# needs 'pangocairo' enabled in graphviz configuration -# - ming -# flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's -# incomplete. -# - cairo/pango: -# Needs pango for text layout, uses cairo methods to draw stuff -# - xlib: -# needs cairo+pango, -# can make use of gnomeui and inotify support (??? unsure), -# needs libXaw for UI -# UI also links directly against libX11, libXmu, and libXt -# and uses libXpm if available so we make sure it always is - -# There can be swig-generated bindings for the following languages (/tclpkg/gv): -# - c-sharp (disabled) -# - scheme (enabled via guile) ... no longer broken on ~x86 -# - go (disabled) -# - io (disabled) -# - java (enabled via java) *2 -# - lua (enabled via lua) -# - ocaml (enabled via ocaml) -# - perl (enabled via perl) *1 -# - php (enabled via php) *2 -# - python (enabled via python) *1 -# - ruby (enabled via ruby) *1 -# - tcl (enabled via tcl) -# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location -# *2 = Those bindings don't build because the paths for the headers/libs aren't -# detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5) - -# There are several other tools in /tclpkg: -# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl -# tkspline, tkstubs ; enabled with: --with-tk - -# And the commands (/cmd): -# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :) -# sci-libs/gts can be used for some of these -# - lefty: -# needs Xaw and X to build -# - gvedit (via 'qt5'): -# based on ./configure it needs qt-core and qt-gui only -# - smyrna : experimental opengl front-end (via 'smyrna') -# currently disabled -- it segfaults a lot -# needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut -# sci-libs/gts, x11-libs/gtk. Also needs 'gtk','glade','glut','gts' and 'png' -# with flags enabled at configure time - -PATCHES=( - "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch - "${FILESDIR}"/${P}-libgv_python.patch - "${FILESDIR}"/${P}-math.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup - - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - default - - # ToDo: Do the same thing for examples and/or - # write a patch for a configuration-option - # and send it to upstream - # note - the longer sed expression removes multi-line assignments that are extended via '\' - if ! use doc ; then - find . -iname Makefile.am \ - | xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \ - -e '/^\(html\|pdf\)_DATA/d' || die - fi - - # This is an old version of libtool - # use the ./configure option to exclude its use, and - # delete the dir since we don't need to eautoreconf it - rm -r libltdl || die - - # Nuke the dead symlinks for the bindings - sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die - - # replace the whitespace with tabs - sed -i -e 's: :\t:g' doc/info/Makefile.am || die - - # use correct version of qmake. bug #567236 - sed -i -e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt5_get_bindir)/qmake)" configure.ac || die - - # workaround for http://www.graphviz.org/mantisbt/view.php?id=1895 - use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos) - - use java && append-cppflags $(java-pkg_get-jni-cflags) - - eautoreconf -} - -src_configure() { - local myconf=( - --enable-ltdl - $(use_with cairo pangocairo) - $(use_with devil) - $(use_enable gdk-pixbuf) - $(use_with gtk) - $(use_with gts) - $(use_with qt5 qt) - $(use_with lasi) - $(use_with pdf poppler) - $(use_with postscript ghostscript) - $(use_enable static-libs static) - $(use_with svg rsvg) - $(use_with X x) - $(use_with X xaw) - $(use_with X lefty) - --with-digcola - --with-fontconfig - --with-freetype2 - --with-ipsepcola - --with-libgd - --with-sfdp - --without-ming - # new/experimental features, to be tested, disable for now - --with-cgraph - --without-glitz - --without-ipsepcola - --without-smyrna - --without-visio - # Bindings: - $(use_enable guile) - $(use_enable java) - $(use_enable perl) - $(use_enable python python2) - $(use_enable python python3) - $(use_enable ruby) - $(use_enable tcl) - --disable-go - --disable-io - --disable-lua - --disable-ocaml - --disable-php - --disable-python - --disable-r - --disable-sharp - # libtool file collision, bug #276609 - --without-included-ltdl - --disable-ltdl-install - ) - econf "${myconf[@]}" -} - -src_install() { - sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die - - emake DESTDIR="${D}" \ - txtdir="${EPREFIX}"/usr/share/doc/${PF} \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \ - pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \ - pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \ - install - - if ! use examples; then - rm -rf "${ED}"/usr/share/graphviz/demo || die - fi - - if ! use static-libs; then - find "${ED}" -name '*.la' -delete || die - fi - - einstalldocs - - use python && python_optimize \ - "${D}$(python_get_sitedir)" \ - "${D}/usr/$(get_libdir)/graphviz/python2" \ - "${D}/usr/$(get_libdir)/graphviz/python3" -} - -pkg_postinst() { - # This actually works if --enable-ltdl is passed - # to configure - dot -c || die -} - -pkg_postrm() { - # Remove cruft, bug #547344 - rm -rf "${EROOT}"usr/$(get_libdir)/graphviz/config{,6} || die -} diff --git a/media-gfx/graphviz/graphviz-2.42.3.ebuild b/media-gfx/graphviz/graphviz-2.42.3.ebuild index 67b51ca4f754..b833f8b72908 100644 --- a/media-gfx/graphviz/graphviz-2.42.3.ebuild +++ b/media-gfx/graphviz/graphviz-2.42.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} ) +PYTHON_COMPAT=( python2_7 python3_{6,7,8} ) inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils DESCRIPTION="Open Source Graph Visualization Software" @@ -12,7 +12,7 @@ SRC_URI="https://www2.graphviz.org/Packages/stable/portable_source/${P}.tar.gz" LICENSE="CPL-1.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD" REQUIRED_USE=" -- cgit v1.2.3