diff options
59 files changed, 30 insertions, 2930 deletions
diff --git a/app-doc/podbrowser/Manifest b/app-doc/podbrowser/Manifest deleted file mode 100644 index 40b4f01a76ff..000000000000 --- a/app-doc/podbrowser/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST podbrowser-0.12.tar.gz 81394 BLAKE2B 14729238bbdd95dbe1c27c3de5067132b9b6c1b1df80bbc8be334afb4c02324629824d63e3870adbe26a8e2dd78c8cd68c3a04be8b9d12570e67060b32d7bf34 SHA512 ff6a734f2df8bb0913c9030fd103490e59178bc672ac1c152eb9a0c2aece82c293615cbfcc7cf99dcfe2c448bdc35d2c6fdcb9b106e958d3ffb62b2eb9372c77 diff --git a/app-doc/podbrowser/files/Makefile.new b/app-doc/podbrowser/files/Makefile.new deleted file mode 100644 index 877b2c9a9233..000000000000 --- a/app-doc/podbrowser/files/Makefile.new +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: Makefile,v 1.4 2005/10/05 10:07:40 jodrell Exp $ -NAME=podbrowser -PREFIX=/usr/local -BINDIR=$(PREFIX)/bin -DATADIR=$(PREFIX)/share -ICONDIR=$(DATADIR)/icons/hicolor/48x48/apps -MANDIR=$(DATADIR)/man/man1 -DESTDIR= - -all: podbrowser - -podbrowser: - @mkdir -p build - - perl -ne 's!\@PREFIX\@!$(PREFIX)!g ; s!\@LIBDIR\@!$(LIBDIR)!g ; print' < $(NAME).pl > build/$(NAME) - pod2man $(NAME).pl | gzip -c > build/$(NAME).1.gz - -install: - mkdir -p $(DESTDIR)/$(BINDIR) \ - $(DESTDIR)/$(DATADIR)/$(NAME) \ - $(DESTDIR)/$(DATADIR)/applications \ - $(DESTDIR)/$(ICONDIR) \ - $(DESTDIR)/$(MANDIR) - install -m 0644 $(NAME).glade $(DESTDIR)/$(DATADIR)/$(NAME)/ - install -m 0644 $(NAME).png $(DESTDIR)/$(ICONDIR)/ - install -m 0644 $(NAME).desktop $(DESTDIR)/$(DATADIR)/applications/ - install -m 0644 build/$(NAME).1.gz $(DESTDIR)/$(MANDIR)/ - install -m 0755 build/$(NAME) $(DESTDIR)/$(BINDIR)/$(NAME) - install -m 0755 html2ps-$(NAME) $(DESTDIR)/$(BINDIR)/html2ps-$(NAME) - -clean: - rm -rf build diff --git a/app-doc/podbrowser/files/missing_icon.patch b/app-doc/podbrowser/files/missing_icon.patch deleted file mode 100644 index 55ec1223bf24..000000000000 --- a/app-doc/podbrowser/files/missing_icon.patch +++ /dev/null @@ -1,32 +0,0 @@ -X-Description: Provide alternative icons if those expected not in current theme -X-Author: Jeffrey Ratcliffe <Jeffrey.Ratcliffe@gmail.com> -X-Bugs-Gentoo: https://bugs.gentoo.org/319573 - ---- podbrowser-0.12/podbrowser.pl -+++ podbrowser-0.12/podbrowser.pl -@@ -60,9 +60,22 @@ - my $APP = Gtk2::GladeXML->new($GLADE_FILE); - my $THEME = get_an_icon_theme(); - my $TIPS = Gtk2::Tooltips->new; --my $IDX_PBF = Gtk2::Gdk::Pixbuf->new_from_file($THEME->lookup_icon('stock_bookmark', 16, 'force-svg')->get_filename)->scale_simple(16, 16, 'bilinear'); --my $PAGE_PBF = Gtk2::Gdk::Pixbuf->new_from_file($THEME->lookup_icon('stock_new-text', 16, 'force-svg')->get_filename)->scale_simple(16, 16, 'bilinear'); --my $FOLDER_PBF = Gtk2::Gdk::Pixbuf->new_from_file($THEME->lookup_icon('gnome-fs-directory', 16, 'force-svg')->get_filename)->scale_simple(16, 16, 'bilinear'); -+my ( $IDX_PBF, $PAGE_PBF, $FOLDER_PBF ); -+if ($THEME->lookup_icon('stock_bookmark', 16, 'force-svg')) { -+ $IDX_PBF = Gtk2::Gdk::Pixbuf->new_from_file($THEME->lookup_icon('stock_bookmark', 16, 'force-svg')->get_filename)->scale_simple(16, 16, 'bilinear'); -+} else { -+ $IDX_PBF = Gtk2::Image->new->render_icon( 'gtk-index', 'menu' ); -+} -+if ($THEME->lookup_icon('stock_new-text', 16, 'force-svg')) { -+ $PAGE_PBF = Gtk2::Gdk::Pixbuf->new_from_file($THEME->lookup_icon('stock_new-text', 16, 'force-svg')->get_filename)->scale_simple(16, 16, 'bilinear'); -+} else { -+ $PAGE_PBF = Gtk2::Image->new->render_icon( 'gtk-new', 'menu' ); -+} -+if ($THEME->lookup_icon('gnome-fs-directory', 16, 'force-svg')) { -+ $FOLDER_PBF = Gtk2::Gdk::Pixbuf->new_from_file($THEME->lookup_icon('gnome-fs-directory', 16, 'force-svg')->get_filename)->scale_simple(16, 16, 'bilinear'); -+} else { -+ $FOLDER_PBF = Gtk2::Image->new->render_icon( 'gtk-directory', 'menu' ); -+} - my $NORMAL_CURSOR = Gtk2::Gdk::Cursor->new('left_ptr'); - my $BUSY_CURSOR = Gtk2::Gdk::Cursor->new('watch'); - my $ITEMS = {}; diff --git a/app-doc/podbrowser/metadata.xml b/app-doc/podbrowser/metadata.xml deleted file mode 100644 index 7faa8dfe9af4..000000000000 --- a/app-doc/podbrowser/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>perl@gentoo.org</email> - <name>Gentoo Perl Project</name> -</maintainer> -</pkgmetadata> diff --git a/app-doc/podbrowser/podbrowser-0.12-r3.ebuild b/app-doc/podbrowser/podbrowser-0.12-r3.ebuild deleted file mode 100644 index 1c3aa499abcb..000000000000 --- a/app-doc/podbrowser/podbrowser-0.12-r3.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -DESCRIPTION="PodBrowser is a documentation browser for Perl" -HOMEPAGE="http://jodrell.net/projects/podbrowser" -SRC_URI="http://jodrell.net/files/podbrowser/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="" -SRC_TEST="do" - -RDEPEND="dev-perl/gtk2-gladexml - dev-perl/Gtk2 - dev-perl/HTML-Parser - dev-perl/Locale-gettext - virtual/perl-Pod-Simple - dev-perl/URI - dev-perl/Gtk2-Ex-PodViewer - dev-perl/Gtk2-Ex-PrintDialog - dev-perl/Gtk2-Ex-Simple-List - || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) - >=x11-libs/gtk+-2.6.0:2 - >=x11-themes/gnome-icon-theme-2.10.0 - >=gnome-base/libglade-2:2.0" - -DEPEND="${RDEPEND} - sys-devel/gettext" - -src_prepare() { - epatch "${FILESDIR}"/missing_icon.patch - cp "${FILESDIR}"/Makefile.new "${S}"/Makefile || die -} - -src_compile() { - emake DESTDIR="${D}" PREFIX=/usr -} - -src_install() { - emake PREFIX=/usr DESTDIR="${D}" install -} diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index a872e0bed141..10f4db72ce8b 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -5,6 +5,4 @@ DIST emacs-23.4-patches-21.tar.xz 19604 BLAKE2B 97327f2079c496c28122203d233a1219 DIST emacs-23.4.tar.bz2 38646508 BLAKE2B 33dac5d27a63b7aab6b4053964a0ecf7f7939c7aea5af15103f2da7bd34fbb18dba7a1bf44cc4fcc2e3fb1439cdf7085d8dfc4b0005f5485748996e75ca6872d SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296 DIST emacs-24.5-patches-4.tar.xz 13632 BLAKE2B 99e70f4ee32c1ba3a66b934de692437aaf0b83eb6fa841ce4569bc58e2bd12802890c2a8496375280c0ce8fa56515918dfdcbc958f349bc2472104e37ad1fcd1 SHA512 569c3a55aaf1102c0bae4ab25ee06372763cd2de8a54e26b3eefd54e585cf90b53c8ffe1ca48eb4fd312a340380fd3f2fcdb584697814bf429129b48fa56ffb5 DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355 SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677 -DIST emacs-25.2-patches-1.tar.xz 2104 BLAKE2B deae1dcaf5c32dcdab365ffab53976158148a125deff2a0373c7da5696c48c36f87f8388fc8f64ab08b3bfcbf694011b58235e972d4bc0e101ca6bbcec779abf SHA512 45c666ba6332c8fb60a925c6af9c0da113f46055159d931feddb99ce19b2a03e0101b3a4d671fe699cd5f33fd58a25791bfb8b16e20f463e5d304902ee24854a -DIST emacs-25.2.tar.xz 46900336 BLAKE2B 4bcb1dbf1647e1abd1006f586f5e465fa9ced78a87a3bc6edd7de7adb3b4145830b9cd7d889811882603a6f4be74e38626a80ab7d097d3331f42e811f3a93710 SHA512 2485d5ccd58ecc953cbd2458bdfa45e3c9a6ddfdb1b93c72b957a0da2460d4e42092905e039e8f5bac337ea1ecb9ac404b28702a363323ee5813b30032ebf00c DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f diff --git a/app-editors/emacs/emacs-25.2-r1.ebuild b/app-editors/emacs/emacs-25.2-r1.ebuild deleted file mode 100644 index b2ad0adcb12d..000000000000 --- a/app-editors/emacs/emacs-25.2-r1.ebuild +++ /dev/null @@ -1,358 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit elisp-common flag-o-matic multilib readme.gentoo-r1 - -DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" -HOMEPAGE="https://www.gnu.org/software/emacs/" -SRC_URI="mirror://gnu/emacs/${P}.tar.xz - https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz" - -LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -SLOT="25" -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib" -REQUIRED_USE="?? ( aqua X )" - -RDEPEND="sys-libs/ncurses:0= - >=app-eselect/eselect-emacs-1.16 - >=app-emacs/emacs-common-gentoo-1.5[games?,X?] - net-libs/liblockfile - acl? ( virtual/acl ) - alsa? ( media-libs/alsa-lib ) - dbus? ( sys-apps/dbus ) - gpm? ( sys-libs/gpm ) - hesiod? ( net-dns/hesiod ) - !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) - kerberos? ( virtual/krb5 ) - libxml2? ( >=dev-libs/libxml2-2.2.0 ) - selinux? ( sys-libs/libselinux ) - ssl? ( net-libs/gnutls:0= ) - zlib? ( sys-libs/zlib ) - X? ( - x11-libs/libXmu - x11-libs/libXt - x11-misc/xbitmaps - gconf? ( >=gnome-base/gconf-2.26.2 ) - gsettings? ( >=dev-libs/glib-2.28.6 ) - gif? ( media-libs/giflib:0= ) - jpeg? ( virtual/jpeg:0= ) - png? ( >=media-libs/libpng-1.4:0= ) - svg? ( >=gnome-base/librsvg-2.0 ) - tiff? ( media-libs/tiff:0 ) - xpm? ( x11-libs/libXpm ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) - xft? ( - media-libs/fontconfig - media-libs/freetype - x11-libs/libXft - cairo? ( >=x11-libs/cairo-1.12.18 ) - m17n-lib? ( - >=dev-libs/libotf-0.9.4 - >=dev-libs/m17n-lib-1.5.1 - ) - ) - gtk? ( - xwidgets? ( - x11-libs/gtk+:3 - net-libs/webkit-gtk:3= - ) - !xwidgets? ( - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( x11-libs/gtk+:2 ) - ) - ) - !gtk? ( - motif? ( >=x11-libs/motif-2.3:0 ) - !motif? ( - Xaw3d? ( x11-libs/libXaw3d ) - !Xaw3d? ( athena? ( x11-libs/libXaw ) ) - ) - ) - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - gzip-el? ( app-arch/gzip ) - pax_kernel? ( sys-apps/attr )" - -RDEPEND="${RDEPEND} - !<app-editors/emacs-vcs-${PV}" - -EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}" -SITEFILE="20${PN}-${SLOT}-gentoo.el" -# FULL_VERSION keeps the full version number, which is needed in -# order to determine some path information correctly for copy/move -# operations later on -FULL_VERSION="${PV%%_*}" -S="${WORKDIR}/emacs-${FULL_VERSION}" - -src_prepare() { - eapply ../patch - eapply_user - - # Fix filename reference in redirected man page - sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ - || die "unable to sed ctags.1" - - #AT_M4DIR=m4 eautoreconf - #touch src/stamp-h.in || die -} - -src_configure() { - strip-flags - filter-flags -pie #526948 - - if use sh; then - replace-flags "-O[1-9]" -O0 #262359 - elif use ia64; then - replace-flags "-O[2-9]" -O1 #325373 - else - replace-flags "-O[3-9]" -O2 - fi - - local myconf - - if use alsa; then - use sound || ewarn \ - "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." - myconf+=" --with-sound=alsa" - else - myconf+=" --with-sound=$(usex sound oss)" - fi - - if use X; then - myconf+=" --with-x --without-ns" - myconf+=" $(use_with gconf)" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with toolkit-scroll-bars)" - myconf+=" $(use_with gif)" - myconf+=" $(use_with jpeg)" - myconf+=" $(use_with png)" - myconf+=" $(use_with svg rsvg)" - myconf+=" $(use_with tiff)" - myconf+=" $(use_with xpm)" - myconf+=" $(use_with imagemagick)" - - if use xft; then - myconf+=" --with-xft" - myconf+=" $(use_with cairo)" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" - else - myconf+=" --without-xft" - myconf+=" --without-cairo" - myconf+=" --without-libotf --without-m17n-flt" - use cairo && ewarn \ - "USE flag \"cairo\" has no effect if \"xft\" is not set." - use m17n-lib && ewarn \ - "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." - fi - - local f line - if use gtk; then - einfo "Configuring to build with GIMP Toolkit (GTK+)" - while read line; do ewarn "${line}"; done <<-EOF - Your version of GTK+ will have problems with closing open - displays. This is no problem if you just use one display, but - if you use more than one and close one of them Emacs may crash. - See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>. - If you intend to use more than one display, then it is strongly - recommended that you compile Emacs with the Athena/Lucid or the - Motif toolkit instead. - EOF - if use xwidgets; then - myconf+=" --with-x-toolkit=gtk3 --with-xwidgets" - else - myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" - myconf+=" --without-xwidgets" - fi - for f in motif Xaw3d athena; do - use ${f} && ewarn \ - "USE flag \"${f}\" has no effect if \"gtk\" is set." - done - elif use motif; then - einfo "Configuring to build with Motif toolkit" - myconf+=" --with-x-toolkit=motif" - for f in Xaw3d athena; do - use ${f} && ewarn \ - "USE flag \"${f}\" has no effect if \"motif\" is set." - done - elif use athena || use Xaw3d; then - einfo "Configuring to build with Athena/Lucid toolkit" - myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" - else - einfo "Configuring to build with no toolkit" - myconf+=" --with-x-toolkit=no" - fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." - elif use aqua; then - einfo "Configuring to build with Nextstep (Cocoa) support" - myconf+=" --with-ns --disable-ns-self-contained" - myconf+=" --without-x" - else - myconf+=" --without-x --without-ns" - fi - - # Save version information in the Emacs binary. It will be available - # in variable "system-configuration-options". - myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}" - - econf \ - --program-suffix="-${EMACS_SUFFIX}" \ - --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ - --localstatedir="${EPREFIX}"/var \ - --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ - --with-gameuser=":gamestat" \ - --without-compress-install \ - --with-file-notification=$(usev inotify || usev gfile || echo no) \ - $(use_enable acl) \ - $(use_with dbus) \ - $(use_with dynamic-loading modules) \ - $(use_with gpm) \ - $(use_with hesiod) \ - $(use_with kerberos) $(use_with kerberos kerberos5) \ - $(use_with libxml2 xml2) \ - $(use_with selinux) \ - $(use_with ssl gnutls) \ - $(use_with wide-int) \ - $(use_with zlib) \ - ${myconf} -} - -src_compile() { - export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 - emake -} - -src_install () { - emake DESTDIR="${D}" NO_BIN_LINK=t install - - mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \ - || die "moving emacs executable failed" - mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \ - || die "moving emacs man page failed" - - # move info dir to avoid collisions with the dir file generated by portage - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ - || die "moving info dir failed" - touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir - docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig - - # avoid collision between slots, see bug #169033 e.g. - rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el - rm -rf "${ED}"/usr/share/{appdata,applications,icons} - rm -rf "${ED}"/var - - # remove unused <version>/site-lisp dir - rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp - - # remove COPYING file (except for etc/COPYING used by describe-copying) - rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING - - if use gzip-el; then - # compress .el files when a corresponding .elc exists - find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ - -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n - assert "gzip .el failed" - fi - - local cdir - if use source; then - cdir="/usr/share/emacs/${FULL_VERSION}/src" - insinto "${cdir}" - # This is not meant to install all the source -- just the - # C source you might find via find-function - doins src/*.{c,h,m} - elif has installsources ${FEATURES}; then - cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" - fi - - sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF - X - ;;; ${PN}-${SLOT} site-lisp configuration - X - (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) - Y (setq find-function-C-source-directory - Y "${EPREFIX}${cdir}") - X (let ((path (getenv "INFOPATH")) - X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") - X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>")) - X (and path - X ;; move Emacs Info dir before anything else in /usr/share/info - X (let* ((p (cons nil (split-string path ":" t))) (q p)) - X (while (and (cdr q) (not (string-match re (cadr q)))) - X (setq q (cdr q))) - X (setcdr q (cons dir (delete dir (cdr q)))) - X (setq Info-directory-list (prune-directory-list (cdr p))))))) - EOF - elisp-site-file-install "${T}/${SITEFILE}" || die - - dodoc README BUGS CONTRIBUTE - - if use aqua; then - dodir /Applications/Gentoo - rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app - mv nextstep/Emacs.app \ - "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die - fi - - DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs - through the Emacs eselect module, which also redirects man and info - pages. Therefore, several Emacs versions can be installed at the - same time. \"man emacs.eselect\" for details. - \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is - strongly recommended that you use app-admin/emacs-updater to rebuild - all byte-compiled elisp files of the installed Emacs packages." - use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. - Installing media-fonts/font-adobe-{75,100}dpi on the X server's - machine would satisfy basic Emacs requirements under X11. - See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs - for how to enable anti-aliased fonts." - use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in - \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink - it into /Applications by yourself." - readme.gentoo_create_doc -} - -pkg_preinst() { - # move Info dir file to correct name - local infodir=/usr/share/info/${EMACS_SUFFIX} f - if [[ -f ${ED}${infodir}/dir.orig ]]; then - mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" - elif [[ -d "${ED}"${infodir} ]]; then - # this should not happen in EAPI 4 - ewarn "Regenerating Info directory index in ${infodir} ..." - rm -f "${ED}"${infodir}/dir{,.*} - for f in "${ED}"${infodir}/*; do - if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then - install-info --info-dir="${ED}"${infodir} "${f}" \ - || die "install-info failed" - fi - done - fi -} - -pkg_postinst() { - elisp-site-regen - readme.gentoo_print_elog - - if use livecd; then - # force an update of the emacs symlink for the livecd/dvd, - # because some microemacs packages set it with USE=livecd - eselect emacs update - elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then - # refresh symlinks in case any installed files have changed - eselect emacs set ${EMACS_SUFFIX} - else - eselect emacs update ifunset - fi -} - -pkg_postrm() { - elisp-site-regen - eselect emacs update ifunset -} diff --git a/app-editors/emacs/emacs-25.3.ebuild b/app-editors/emacs/emacs-25.3.ebuild index e5ff6db30523..6be101976949 100644 --- a/app-editors/emacs/emacs-25.3.ebuild +++ b/app-editors/emacs/emacs-25.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="25" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib" REQUIRED_USE="?? ( aqua X )" RDEPEND="sys-libs/ncurses:0= @@ -54,14 +54,8 @@ RDEPEND="sys-libs/ncurses:0= ) ) gtk? ( - xwidgets? ( - x11-libs/gtk+:3 - net-libs/webkit-gtk:3= - ) - !xwidgets? ( - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( x11-libs/gtk+:2 ) - ) + gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) @@ -161,12 +155,12 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - if use xwidgets; then - myconf+=" --with-x-toolkit=gtk3 --with-xwidgets" - else + #if use xwidgets; then + # myconf+=" --with-x-toolkit=gtk3 --with-xwidgets" + #else myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" myconf+=" --without-xwidgets" - fi + #fi for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -185,8 +179,8 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." + #! use gtk && use xwidgets && ewarn \ + # "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." elif use aqua; then einfo "Configuring to build with Nextstep (Cocoa) support" myconf+=" --with-ns --disable-ns-self-contained" diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml index 61b88217833d..64c34d30c315 100644 --- a/app-editors/emacs/metadata.xml +++ b/app-editors/emacs/metadata.xml @@ -47,7 +47,7 @@ <flag name="wide-int">Prefer wide Emacs integers (typically 62-bit). This option has an effect only on architectures where "long" and "long long" types have different size.</flag> - <flag name='xwidgets'>Enable use of GTK widgets in Emacs buffers - (requires GTK3)</flag> + <!--flag name='xwidgets'>Enable use of GTK widgets in Emacs buffers + (requires GTK3)</flag--> </use> </pkgmetadata> diff --git a/app-officeext/ooofbtools/ooofbtools-2.51.ebuild b/app-officeext/ooofbtools/ooofbtools-2.51.ebuild index 0c5234aaa3d0..5cea90c2d8d3 100644 --- a/app-officeext/ooofbtools/ooofbtools-2.51.ebuild +++ b/app-officeext/ooofbtools/ooofbtools-2.51.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" RDEPEND="dev-libs/libxml2 app-arch/zip" diff --git a/dev-cpp/pficommon/Manifest b/dev-cpp/pficommon/Manifest deleted file mode 100644 index 461949647455..000000000000 --- a/dev-cpp/pficommon/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pficommon-1.3.1.0.tar.gz 441406 BLAKE2B 647fd263392db90725609248a684295b207f68701c668c569ce85859796f719963e14fdf51ad93841d6e540df63197b586d0a13aace3c23ddb26a129dacf2fff SHA512 95ef445c2f004c0921bdcae7ee50fc3a744d4960f9bc76c13254394c4ae41fad11ea200002b9fde3e099ef509ffe9ba9ea21d69ba1123699ab3338d7afbcf420 diff --git a/dev-cpp/pficommon/files/pficommon-1.3.1.0-gcc-4.7.patch b/dev-cpp/pficommon/files/pficommon-1.3.1.0-gcc-4.7.patch deleted file mode 100644 index 283ef2d7da90..000000000000 --- a/dev-cpp/pficommon/files/pficommon-1.3.1.0-gcc-4.7.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 5669e7ea665323ee774eda9c77206102fa499453 Mon Sep 17 00:00:00 2001 -From: Hideyuki Tanaka <tanaka.hideyuki@gmail.com> -Date: Mon, 21 May 2012 17:21:34 +0900 -Subject: [PATCH] add include <unistd.h> (for gcc-4.7.0) - ---- - src/network/socket.cpp | 1 + - src/system/mmapper.cpp | 1 + - tools/genrpc/main.cpp | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/src/network/socket.cpp b/src/network/socket.cpp -index b5c50e4..1fba6e6 100644 ---- a/src/network/socket.cpp -+++ b/src/network/socket.cpp -@@ -40,6 +40,7 @@ - #include <netinet/in.h> - #include <netinet/tcp.h> - #include <arpa/inet.h> -+#include <unistd.h> - - #include "dns.h" - #include "../system/syscall.h" -diff --git a/src/system/mmapper.cpp b/src/system/mmapper.cpp -index 90eb7b8..e963fd8 100644 ---- a/src/system/mmapper.cpp -+++ b/src/system/mmapper.cpp -@@ -35,6 +35,7 @@ - #include <sys/stat.h> - #include <fcntl.h> - #include <sys/mman.h> -+#include <unistd.h> - - #include "syscall.h" - -diff --git a/tools/genrpc/main.cpp b/tools/genrpc/main.cpp -index 100ea4e..3e5ef16 100644 ---- a/tools/genrpc/main.cpp -+++ b/tools/genrpc/main.cpp -@@ -4,6 +4,7 @@ - #include <cctype> - #include <cstring> - #include <cstdio> -+#include <unistd.h> - using namespace std; - - #include "../../src/lang/shared_ptr.h" --- -1.7.10 - diff --git a/dev-cpp/pficommon/files/pficommon-1.3.1.0-gcc6.patch b/dev-cpp/pficommon/files/pficommon-1.3.1.0-gcc6.patch deleted file mode 100644 index 623738389195..000000000000 --- a/dev-cpp/pficommon/files/pficommon-1.3.1.0-gcc6.patch +++ /dev/null @@ -1,350 +0,0 @@ ---- a/src/network/cgi/inserter.cpp -+++ b/src/network/cgi/inserter.cpp -@@ -50,8 +50,8 @@ - - tag_inserter::~tag_inserter() - { -- shared_ptr<tag_elem> elem(new tag_elem(name, attrs)); -- vector<shared_ptr<html_elem> > children=b.leave(); -+ pfi::lang::shared_ptr<tag_elem> elem(new tag_elem(name, attrs)); -+ vector<pfi::lang::shared_ptr<html_elem> > children=b.leave(); - for (int i=0;i<(int)children.size();i++) - elem->add_child(children[i]); - b.push(elem); -@@ -59,12 +59,12 @@ - - text_inserter::text_inserter(const string &text, xhtml_builder &b) - { -- b.push(shared_ptr<html_elem>(new text_elem(text))); -+ b.push(pfi::lang::shared_ptr<html_elem>(new text_elem(text))); - } - - prim_inserter::prim_inserter(const string &text, xhtml_builder &b) - { -- b.push(shared_ptr<html_elem>(new prim_elem(text))); -+ b.push(pfi::lang::shared_ptr<html_elem>(new prim_elem(text))); - } - - } // cgi ---- a/src/network/cgi/server.cpp -+++ b/src/network/cgi/server.cpp -@@ -161,12 +161,12 @@ - <<", thread-num="<<thread_num - <<", timeout="<<ssock->timeout()<<endl; - -- ths=vector<shared_ptr<thread> >(thread_num); -- vector<shared_ptr<cgi, threading_model::multi_thread> > cgis(thread_num); -+ ths=vector<pfi::lang::shared_ptr<thread> >(thread_num); -+ vector<pfi::lang::shared_ptr<cgi, threading_model::multi_thread> > cgis(thread_num); - - for (int i=0; i<thread_num; i++){ -- cgis[i]=shared_ptr<cgi, threading_model::multi_thread>(dynamic_cast<cgi*>(c.clone())); -- ths[i]=shared_ptr<thread>(new thread(bind(&run_server::process, this, ssock, cgis[i]))); -+ cgis[i]=pfi::lang::shared_ptr<cgi, threading_model::multi_thread>(dynamic_cast<cgi*>(c.clone())); -+ ths[i]=pfi::lang::shared_ptr<thread>(new thread(bind(&run_server::process, this, ssock, cgis[i]))); - if (!ths[i]->start()){ - ostringstream oss; - oss<<"unable to start thread"<<endl; -@@ -185,7 +185,7 @@ - ths.clear(); - } - --static shared_ptr<http::response> gen_resp(stringstream &ss) -+static pfi::lang::shared_ptr<http::response> gen_resp(stringstream &ss) - { - http::header head(ss); - -@@ -210,7 +210,7 @@ - head.erase("status"); - } - -- shared_ptr<http::response> resp(new http::response(code, reason)); -+ pfi::lang::shared_ptr<http::response> resp(new http::response(code, reason)); - - head["Content-Type"]=content_type; - -@@ -232,10 +232,10 @@ - } - - void run_server::process(socket_type ssock, -- shared_ptr<cgi, threading_model::multi_thread> cc) -+ pfi::lang::shared_ptr<cgi, threading_model::multi_thread> cc) - { - for (;;){ -- shared_ptr<stream_socket> sock(ssock->accept()); -+ pfi::lang::shared_ptr<stream_socket> sock(ssock->accept()); - if (!sock) continue; - - if (ssock->timeout()>0 && !sock->set_timeout(ssock->timeout())) -@@ -272,7 +272,7 @@ - - cc->exec(req.body(), sout, cerr, env); - -- shared_ptr<http::response> resp=gen_resp(sout); -+ pfi::lang::shared_ptr<http::response> resp=gen_resp(sout); - resp->send(sock); - } - catch(const exception &e){ ---- a/src/network/http/base.cpp -+++ b/src/network/http/base.cpp -@@ -61,7 +61,7 @@ - { - } - --void header::read_header(function<bool(string*)> f) -+void header::read_header(pfi::lang::function<bool(string*)> f) - { - string line, key, val; - if (!f(&line)) -@@ -124,7 +124,7 @@ - return sock->getline(*str, line_limit); - } - --header::header(shared_ptr<stream_socket> sock) -+header::header(pfi::lang::shared_ptr<stream_socket> sock) - { - read_header(bind(&socket_getline, sock.get(), _1, line_limit)); - } -@@ -211,7 +211,7 @@ - return dat.end(); - } - --void header::send(shared_ptr<stream_socket> sock) -+void header::send(pfi::lang::shared_ptr<stream_socket> sock) - { - for (int i=0;i<(int)dat.size();i++){ - string line=dat[i].first+": "+dat[i].second+"\r\n"; -@@ -228,7 +228,7 @@ - public: - typedef C char_type; - -- basic_httpbody_chunked_streambuf(shared_ptr<stream_socket> sock) -+ basic_httpbody_chunked_streambuf(pfi::lang::shared_ptr<stream_socket> sock) - : sock(sock) - , chunk_rest(0) - , buf(buf_size) -@@ -321,7 +321,7 @@ - iss>>hex>>chunk_rest; - } - -- shared_ptr<stream_socket> sock; -+ pfi::lang::shared_ptr<stream_socket> sock; - - int chunk_rest; - -@@ -334,7 +334,7 @@ - public: - typedef C char_type; - -- basic_httpbody_streambuf(shared_ptr<stream_socket> sock, int length) -+ basic_httpbody_streambuf(pfi::lang::shared_ptr<stream_socket> sock, int length) - : sock(sock) - , rest(length) - , buf(T::eof()){ -@@ -359,7 +359,7 @@ - } - - private: -- shared_ptr<stream_socket> sock; -+ pfi::lang::shared_ptr<stream_socket> sock; - - int rest; - int buf; -@@ -368,7 +368,7 @@ - template <class C, class T=char_traits<C> > - class basic_httpbody_chunked_stream : public basic_iostream<C,T>{ - public: -- basic_httpbody_chunked_stream(shared_ptr<stream_socket> sock) -+ basic_httpbody_chunked_stream(pfi::lang::shared_ptr<stream_socket> sock) - : basic_iostream<C,T>() - , buf(sock){ - this->init(&buf); -@@ -380,7 +380,7 @@ - template <class C, class T=char_traits<C> > - class basic_httpbody_stream : public basic_iostream<C,T>{ - public: -- basic_httpbody_stream(shared_ptr<stream_socket> sock, int len) -+ basic_httpbody_stream(pfi::lang::shared_ptr<stream_socket> sock, int len) - : basic_iostream<C,T>() - , buf(sock, len){ - this->init(&buf); -@@ -406,7 +406,7 @@ - { - } - --request::request(shared_ptr<stream_socket> sock) -+request::request(pfi::lang::shared_ptr<stream_socket> sock) - : method_("") - , uri_("/") - , version_(1,1) -@@ -438,11 +438,11 @@ - - // body - if (cicmp(header_["Transfer-Encoding"],"chunked")) -- stream=shared_ptr<iostream>(new basic_httpbody_chunked_stream<char>(sock)); -+ stream=pfi::lang::shared_ptr<iostream>(new basic_httpbody_chunked_stream<char>(sock)); - else if (header_["Content-Length"]!="") -- stream=shared_ptr<iostream>(new basic_httpbody_stream<char>(sock, lexical_cast<int>(header_["Content-Length"]))); -+ stream=pfi::lang::shared_ptr<iostream>(new basic_httpbody_stream<char>(sock, lexical_cast<int>(header_["Content-Length"]))); - else -- stream=shared_ptr<iostream>(new socketstream(sock)); -+ stream=pfi::lang::shared_ptr<iostream>(new socketstream(sock)); - } - - request::~request() -@@ -474,7 +474,7 @@ - return *stream; - } - --void request::send(shared_ptr<stream_socket> sock) -+void request::send(pfi::lang::shared_ptr<stream_socket> sock) - { - stringstream *ss=dynamic_cast<stringstream*>(stream.get()); - if (!ss) throw http_exception("body is not stringstream"); -@@ -499,7 +499,7 @@ - if (sock->flush()>=0) - throw http_exception("flush failed"); - if (dat.length()==0) -- stream=shared_ptr<iostream>(new socketstream(sock)); -+ stream=pfi::lang::shared_ptr<iostream>(new socketstream(sock)); - } - - response::response() -@@ -518,7 +518,7 @@ - { - } - --response::response(shared_ptr<stream_socket> sock) -+response::response(pfi::lang::shared_ptr<stream_socket> sock) - { - // status-line - { -@@ -546,11 +546,11 @@ - - // body - if (cicmp(header_["Transfer-Encoding"],"chunked")) -- stream=shared_ptr<iostream>(new basic_httpbody_chunked_stream<char>(sock)); -+ stream=pfi::lang::shared_ptr<iostream>(new basic_httpbody_chunked_stream<char>(sock)); - else if (header_["Content-Length"]!="") -- stream=shared_ptr<iostream>(new basic_httpbody_stream<char>(sock, lexical_cast<int>(header_["Content-Length"]))); -+ stream=pfi::lang::shared_ptr<iostream>(new basic_httpbody_stream<char>(sock, lexical_cast<int>(header_["Content-Length"]))); - else -- stream=shared_ptr<iostream>(new socketstream(sock)); -+ stream=pfi::lang::shared_ptr<iostream>(new socketstream(sock)); - } - - response::~response() -@@ -582,7 +582,7 @@ - return *stream; - } - --void response::send(shared_ptr<stream_socket> sock) -+void response::send(pfi::lang::shared_ptr<stream_socket> sock) - { - stringstream *ss=dynamic_cast<stringstream*>(stream.get()); - if (!ss) throw http_exception("body is not stringstream"); -@@ -607,7 +607,7 @@ - if (sock->flush()>=0) - throw http_exception("flush failed"); - if (dat.length()==0) -- stream=shared_ptr<iostream>(new socketstream(sock)); -+ stream=pfi::lang::shared_ptr<iostream>(new socketstream(sock)); - } - - } // http ---- a/src/network/rpc/base.cpp -+++ b/src/network/rpc/base.cpp -@@ -59,20 +59,20 @@ - { - } - --void rpc_server::add(const string &name, shared_ptr<invoker_base> invoker) -+void rpc_server::add(const string &name, pfi::lang::shared_ptr<invoker_base> invoker) - { - funcs[name]=invoker; - } - - bool rpc_server::serv(uint16_t port, int nthreads) - { -- shared_ptr<server_socket, threading_model::multi_thread> ssock(new server_socket()); -+ pfi::lang::shared_ptr<server_socket, threading_model::multi_thread> ssock(new server_socket()); - if (!ssock->create(port)) - return false; - -- vector<shared_ptr<thread> > ths(nthreads); -+ vector<pfi::lang::shared_ptr<thread> > ths(nthreads); - for (int i=0; i<nthreads; i++){ -- ths[i]=shared_ptr<thread>(new thread(bind(&rpc_server::process, this, ssock))); -+ ths[i]=pfi::lang::shared_ptr<thread>(new thread(bind(&rpc_server::process, this, ssock))); - if (!ths[i]->start()) return false; - } - for (int i=0; i<nthreads; i++) -@@ -80,10 +80,10 @@ - return true; - } - --void rpc_server::process(shared_ptr<server_socket, threading_model::multi_thread> ssock) -+void rpc_server::process(pfi::lang::shared_ptr<server_socket, threading_model::multi_thread> ssock) - { - for (;;){ -- shared_ptr<stream_socket> sock(ssock->accept()); -+ pfi::lang::shared_ptr<stream_socket> sock(ssock->accept()); - if (!sock) continue; - sock->set_nodelay(true); - -@@ -139,11 +139,11 @@ - { - } - --shared_ptr<socketstream> rpc_client::get_connection() -+pfi::lang::shared_ptr<socketstream> rpc_client::get_connection() - { - for (int i=0;i<2;i++){ - if (!ss || !(*ss)){ -- ss=shared_ptr<socketstream>(new socketstream(host, port)); -+ ss=pfi::lang::shared_ptr<socketstream>(new socketstream(host, port)); - if (!(*ss)){ - ss.reset(); - continue; -@@ -180,7 +180,7 @@ - return ss; - } - --void rpc_client::return_connection(shared_ptr<socketstream> css) -+void rpc_client::return_connection(pfi::lang::shared_ptr<socketstream> css) - { - ss=css; - } ---- a/src/network/socket.cpp -+++ b/src/network/socket.cpp -@@ -58,7 +58,7 @@ - namespace pfi{ - namespace network{ - --shared_ptr<dns_resolver, threading_model::multi_thread> stream_socket::resolver; -+pfi::lang::shared_ptr<dns_resolver, threading_model::multi_thread> stream_socket::resolver; - r_mutex stream_socket::resolver_m; - - class sigign{ -@@ -88,7 +88,7 @@ - close(); - } - --void stream_socket::set_dns_resolver(shared_ptr<dns_resolver, threading_model::multi_thread> r) -+void stream_socket::set_dns_resolver(pfi::lang::shared_ptr<dns_resolver, threading_model::multi_thread> r) - { - synchronized(resolver_m) - resolver=r; -@@ -106,10 +106,10 @@ - return false; - } - -- shared_ptr<dns_resolver, threading_model::multi_thread> res; -+ pfi::lang::shared_ptr<dns_resolver, threading_model::multi_thread> res; - synchronized(resolver_m){ - if (!resolver) -- set_dns_resolver(shared_ptr<dns_resolver, threading_model::multi_thread> -+ set_dns_resolver(pfi::lang::shared_ptr<dns_resolver, threading_model::multi_thread> - (new normal_dns_resolver())); - res=resolver; - } diff --git a/dev-cpp/pficommon/files/pficommon-1.3.1.0-libdir.patch b/dev-cpp/pficommon/files/pficommon-1.3.1.0-libdir.patch deleted file mode 100644 index 9bd0e4bf560d..000000000000 --- a/dev-cpp/pficommon/files/pficommon-1.3.1.0-libdir.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/wscript b/wscript -index dc1866e..c5b800c 100644 ---- a/wscript -+++ b/wscript -@@ -6,18 +6,21 @@ out = 'build' - - import Options - import sys -+import os - - subdirs = 'src tools' - - def options(opt): - opt.load('compiler_cxx') - opt.load('unittest_gtest') -+ opt.load('gnu_dirs') - - opt.recurse(subdirs) - - def configure(conf): - conf.check_tool('compiler_cxx') - conf.check_tool('unittest_gtest') -+ conf.check_tool('gnu_dirs') - - conf.env.append_unique( - 'CXXFLAGS', -@@ -28,6 +31,8 @@ def configure(conf): - conf.recurse(subdirs) - - conf.define('PFICOMMON_VERSION', VERSION) -+ -+ conf.env['VERSION'] = VERSION - - conf.write_config_header('src/pfi-config.h') - -@@ -72,11 +77,11 @@ def build(bld): - bld(source = 'pficommon.pc.in', - prefix = bld.env['PREFIX'], - exec_prefix = '${prefix}', -- libdir = '${prefix}/lib', -+ libdir = bld.env['LIBDIR'], - includedir = '${prefix}/include', - PACKAGE = APPNAME, - VERSION = VERSION) - -- bld.install_files('${PREFIX}/lib/pkgconfig', 'pficommon.pc') -+ bld.install_files(os.path.join(bld.env['LIBDIR'], 'pkgconfig'), 'pficommon.pc') - - bld.recurse(subdirs) diff --git a/dev-cpp/pficommon/files/pficommon-1.3.1.0-postgresql.patch b/dev-cpp/pficommon/files/pficommon-1.3.1.0-postgresql.patch deleted file mode 100644 index 0bf7096ad94f..000000000000 --- a/dev-cpp/pficommon/files/pficommon-1.3.1.0-postgresql.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/database/wscript b/src/database/wscript -index 8eca1d0..3916a7d 100644 ---- a/src/database/wscript -+++ b/src/database/wscript -@@ -20,7 +20,7 @@ def configure(conf): - conf.env.BUILD_PGSQL = False - if not Options.options.disable_database: - try: -- incdir = subprocess.check_output(['pg_config', '--includedir-server']).decode() -+ incdir = subprocess.check_output(['pg_config', '--includedir-server']).decode('utf-8') - libdir = subprocess.check_output(['pg_config', '--libdir']).decode() - if conf.check_cxx(lib = 'pq', - header_name = 'postgres.h', diff --git a/dev-cpp/pficommon/files/pficommon-1.3.1.0-soname.patch b/dev-cpp/pficommon/files/pficommon-1.3.1.0-soname.patch deleted file mode 100644 index 040fb259bc7d..000000000000 --- a/dev-cpp/pficommon/files/pficommon-1.3.1.0-soname.patch +++ /dev/null @@ -1,200 +0,0 @@ -diff --git a/src/concurrent/wscript b/src/concurrent/wscript -index 5aeb5ab..8700d68 100644 ---- a/src/concurrent/wscript -+++ b/src/concurrent/wscript -@@ -19,6 +19,7 @@ def build(bld): - source = 'thread.cpp mutex.cpp rwmutex.cpp condition.cpp internal.cpp', - target = 'pficommon_concurrent', - includes = '.', -+ vnum = bld.env['VERSION'], - use = 'pficommon_system PTHREAD') - - bld.program( -diff --git a/src/data/wscript b/src/data/wscript -index e99c7c3..df47caf 100644 ---- a/src/data/wscript -+++ b/src/data/wscript -@@ -61,6 +61,7 @@ def build(bld): - ], - target = 'pficommon_data', - includes = incdirs, -+ vnum = bld.env['VERSION'], - use = 'pficommon_system') - - def t(src): -diff --git a/src/database/mysql/wscript b/src/database/mysql/wscript -index 79d5a23..5407091 100644 ---- a/src/database/mysql/wscript -+++ b/src/database/mysql/wscript -@@ -7,4 +7,5 @@ def build(bld): - source = 'connection.cpp statement.cpp value.cpp', - target = 'pficommon_database_mysql', - includes = '. ..', -+ vnum = bld.env['VERSION'], - use = 'pficommon_concurrent MYSQL') -diff --git a/src/database/postgresql/wscript b/src/database/postgresql/wscript -index 9b834f8..5040a69 100644 ---- a/src/database/postgresql/wscript -+++ b/src/database/postgresql/wscript -@@ -7,4 +7,5 @@ def build(bld): - source = 'connection.cpp statement.cpp result.cpp value.cpp', - target = 'pficommon_database_postgresql', - includes = '. ..', -+ vnum = bld.env['VERSION'], - use = 'PGSQL') -diff --git a/src/database/wscript b/src/database/wscript -index b491d4f..3916a7d 100644 ---- a/src/database/wscript -+++ b/src/database/wscript -@@ -44,6 +44,7 @@ def build(bld): - t = bld.shlib( - source = '', - target = 'pficommon_database', -+ vnum = bld.env['VERSION'], - use = []) - - if bld.env.BUILD_MYSQL: -diff --git a/src/lang/wscript b/src/lang/wscript -index e5538d9..e0ad364 100644 ---- a/src/lang/wscript -+++ b/src/lang/wscript -@@ -20,6 +20,7 @@ def build(bld): - - bld.shlib( - source = 'empty.cpp', -+ vnum = bld.env['VERSION'], - target = 'pficommon_lang') - - bld.program( -diff --git a/src/math/wscript b/src/math/wscript -index 8e8e271..f855b3a 100644 ---- a/src/math/wscript -+++ b/src/math/wscript -@@ -14,6 +14,7 @@ def build(bld): - bld.shlib( - source = 'random/mersenne_twister.cpp', - target = 'pficommon_math', -+ vnum = bld.env['VERSION'], - includes = '.') - - def t(src): -diff --git a/src/network/wscript b/src/network/wscript -index 4b0873c..d5a9aee 100644 ---- a/src/network/wscript -+++ b/src/network/wscript -@@ -56,11 +56,13 @@ def build(bld): - source = 'socket.cpp ipv4.cpp dns.cpp uri.cpp', - target = 'pficommon_network_base', - includes = '.', -+ vnum = bld.env['VERSION'], - use = 'pficommon_concurrent') - - pfin = bld.shlib( - source = '', - target = 'pficommon_network', -+ vnum = bld.env['VERSION'], - use = [ - 'pficommon_network_base', - 'pficommon_network_http', -diff --git a/src/system/wscript b/src/system/wscript -index 4068967..a6fc70c 100644 ---- a/src/system/wscript -+++ b/src/system/wscript -@@ -21,6 +21,7 @@ def build(bld): - 'sysstat.cpp', - 'mmapper.cpp'], - target = 'pficommon_system', -+ vnum = bld.env['VERSION'], - includes = '.') - - bld.program( -diff --git a/src/text/wscript b/src/text/wscript -index 2cb54df..e18310c 100644 ---- a/src/text/wscript -+++ b/src/text/wscript -@@ -16,6 +16,7 @@ def build(bld): - source = 'xhtml.cpp csv.cpp json/parser.cpp', - target = 'pficommon_text', - includes = '. json', -+ vnum = bld.env['VERSION'], - use = 'pficommon_data pficommon_system') - - bld.program( -diff --git a/src/util/wscript b/src/util/wscript -index c971da4..7ed427f 100644 ---- a/src/util/wscript -+++ b/src/util/wscript -@@ -8,6 +8,7 @@ def build(bld): - - bld.shlib( - source = '', -+ vnum = bld.env['VERSION'], - target = 'pficommon_util') - - bld(features = 'cxx cprogram gtest', -diff --git a/src/visualization/wscript b/src/visualization/wscript -index bf0500a..04469a1 100644 ---- a/src/visualization/wscript -+++ b/src/visualization/wscript -@@ -27,6 +27,7 @@ def build(bld): - v = bld.shlib( - source = ['empty.cpp'], - target = 'pficommon_visualization', -+ vnum = bld.env['VERSION'], - use = []) - - bld.program( -diff --git a/src/wscript b/src/wscript -index 8dfd9e8..4af7585 100644 ---- a/src/wscript -+++ b/src/wscript -@@ -26,6 +26,7 @@ def build(bld): - b = bld.shlib( - source = 'empty.cpp', - target = 'pficommon', -+ vnum = bld.env['VERSION'], - use = [ - 'pficommon_concurrent', - 'pficommon_data', -diff --git a/src/network/cgi/wscript b/src/network/cgi/wscript -index 29c44fa..1863394 100644 ---- a/src/network/cgi/wscript -+++ b/src/network/cgi/wscript -@@ -47,6 +47,7 @@ def build(bld): - source = 'base.cpp xhtml_cgi.cpp xhtml_builder.cpp inserter.cpp cgi.cpp server.cpp util.cpp', - target = 'pficommon_network_cgi', - includes = '. ..', -+ vnum = bld.env['VERSION'], - use = 'pficommon_text pficommon_concurrent pficommon_network_http PTHREAD') - - if bld.env.BUILD_FCGI: -diff --git a/src/network/http/wscript b/src/network/http/wscript -index 7e2bbbe..dbfe480 100644 ---- a/src/network/http/wscript -+++ b/src/network/http/wscript -@@ -14,4 +14,5 @@ def build(bld): - source = 'base.cpp', - target = 'pficommon_network_http', - includes = '. ..', -+ vnum = bld.env['VERSION'], - use = 'pficommon_network_base') -diff --git a/src/network/mprpc/wscript b/src/network/mprpc/wscript -index 940bdd4..0e093f6 100644 ---- a/src/network/mprpc/wscript -+++ b/src/network/mprpc/wscript -@@ -21,4 +21,5 @@ def build(bld): - 'socket.cpp' - ], - target = 'pficommon_network_mprpc', -+ vnum = bld.env['VERSION'], - use = 'pficommon_concurrent pficommon_network_base MSGPACK') -diff --git a/src/network/rpc/wscript b/src/network/rpc/wscript -index 74c006c..46121d6 100644 ---- a/src/network/rpc/wscript -+++ b/src/network/rpc/wscript -@@ -17,4 +17,5 @@ def build(bld): - source = 'base.cpp', - target = 'pficommon_network_rpc', - includes = '. ..', -+ vnum = bld.env['VERSION'], - use = 'pficommon_network_base pficommon_concurrent pficommon_system') diff --git a/dev-cpp/pficommon/metadata.xml b/dev-cpp/pficommon/metadata.xml deleted file mode 100644 index 0f0b8821e971..000000000000 --- a/dev-cpp/pficommon/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>naota@gentoo.org</email> - </maintainer> - <use> - <flag name="fcgi">Build FCGI feature</flag> - <flag name="mprpc">Build MessagePack RPC feature</flag> - </use> - <upstream> - <remote-id type="github">pfi/pficommon</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-cpp/pficommon/pficommon-1.3.1.0.ebuild b/dev-cpp/pficommon/pficommon-1.3.1.0.ebuild deleted file mode 100644 index db9afe674b6f..000000000000 --- a/dev-cpp/pficommon/pficommon-1.3.1.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='threads(+)' -inherit python-any-r1 waf-utils eutils - -DESCRIPTION="General purpose C++ library for PFI" -HOMEPAGE="https://github.com/pfi/pficommon" -SRC_URI="https://github.com/pfi/pficommon/tarball/${PV} -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="fcgi imagemagick mprpc mysql postgres test" - -RDEPEND="fcgi? ( dev-libs/fcgi ) - imagemagick? ( - media-libs/lcms - media-gfx/imagemagick[cxx] - sys-devel/libtool - ) - mprpc? ( dev-libs/msgpack ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql ) - " -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - test? ( dev-cpp/gtest )" - -src_unpack() { - unpack ${A} - mv pfi-pficommon-* "${S}" -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-libdir.patch \ - "${FILESDIR}"/${P}-soname.patch \ - "${FILESDIR}"/${P}-postgresql.patch \ - "${FILESDIR}"/${P}-gcc-4.7.patch \ - "${FILESDIR}"/${P}-gcc6.patch -} - -src_configure() { - if use fcgi; then - myconf="${myconf} --with-fcgi=/usr" - else - myconf="${myconf} --disable-fcgi" - fi - use imagemagick || myconf="${myconf} --disable-magickpp" - use mprpc || myconf="${myconf} --disable-mprpc" - if ! use mysql && ! use postgres; then - myconf="${myconf} --disable-database" - fi - waf-utils_src_configure ${myconf} -} diff --git a/dev-libs/libebml/libebml-1.3.5.ebuild b/dev-libs/libebml/libebml-1.3.5.ebuild index 637d22891b84..ecc1cd998b6d 100644 --- a/dev-libs/libebml/libebml-1.3.5.ebuild +++ b/dev-libs/libebml/libebml-1.3.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0/4" # subslot = soname major version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" IUSE="debug static-libs" src_prepare() { diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.15.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.15.1.ebuild index 0fc227141642..d5c34e353b89 100644 --- a/dev-util/bitcoin-tx/bitcoin-tx-0.15.1.ebuild +++ b/dev-util/bitcoin-tx/bitcoin-tx-0.15.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2010-2017 Gentoo Foundation +# Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ DESCRIPTION="Command-line Bitcoin transaction tool" HOMEPAGE="http://bitcoincore.org/ http://bitcoinknots.org/" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux" SRC_URI=" https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz diff --git a/dev-vcs/bzr-gtk/Manifest b/dev-vcs/bzr-gtk/Manifest deleted file mode 100644 index 878d40669c0c..000000000000 --- a/dev-vcs/bzr-gtk/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST bzr-gtk-0.104.0.tar.gz 218863 BLAKE2B 3e58368e2a97f0cf7b83f6175ac8d9ddfd733d66852f9ca5f7b62d0c492ec22fb12401cfa0f5afa436e81028b93727d8d49b9f83f58913381f4ebd2464d5e707 SHA512 d39a1303570dd7504cad9211f3b1c86d3e6f022535c262b7b5f7b19899b362ff7b01d9f19e557cb4391d7ccf1470635ebc5d5380d2d5216b6610c4e8e1b7b6a3 diff --git a/dev-vcs/bzr-gtk/bzr-gtk-0.104.0-r1.ebuild b/dev-vcs/bzr-gtk/bzr-gtk-0.104.0-r1.ebuild deleted file mode 100644 index be54ead86506..000000000000 --- a/dev-vcs/bzr-gtk/bzr-gtk-0.104.0-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DISTUTILS_SINGLE_IMPL=1 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -MY_P="/${P/_rc/rc}" - -DESCRIPTION="A GTK+ interfaces to most Bazaar operations" -HOMEPAGE="http://bazaar-vcs.org/bzr-gtk" -SRC_URI="https://launchpad.net/${PN}/gtk3/${PV}/+download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gnome-keyring gpg nautilus" - -DEPEND=">=dev-vcs/bzr-1.6_rc1[${PYTHON_USEDEP}] - dev-python/pygobject[${PYTHON_USEDEP}] - dev-python/notify-python[${PYTHON_USEDEP}] - >=dev-python/pycairo-1.0[${PYTHON_USEDEP}] - nautilus? ( - >=dev-python/nautilus-python-1.0[${PYTHON_USEDEP}] - virtual/pkgconfig - )" -RDEPEND="${DEPEND} - nautilus? ( >=dev-python/nautilus-python-1.0[${PYTHON_USEDEP}] ) - dev-python/notify-python[${PYTHON_USEDEP}] - gnome-keyring? ( dev-python/gnome-keyring-python[${PYTHON_USEDEP}] ) - gpg? ( app-crypt/seahorse )" - -S="${WORKDIR}/${MY_P}" - -#TODO: src_test - -python_prepare_all() { - cp "${FILESDIR}"/credits.pickle "${S}"/credits.pickle || die - - distutils-r1_python_prepare_all -} - -python_install() { - distutils-r1_python_install - - if ! use nautilus; then - # automagic dep - rm -rf "${D%/}"/usr/$(get_libdir)/nautilus/ || die - rm -rf "${D%/}"$(python_get_sitedir)/bzrlib/plugins/gtk/nautilus-bzr.py* || die - fi -} - -python_install_all() { - distutils-r1_python_install_all - - insinto /etc/xdg/autostart - doins bzr-notify.desktop -} diff --git a/dev-vcs/bzr-gtk/files/credits.pickle b/dev-vcs/bzr-gtk/files/credits.pickle deleted file mode 100644 index fc0e9deceaec..000000000000 --- a/dev-vcs/bzr-gtk/files/credits.pickle +++ /dev/null @@ -1,193 +0,0 @@ -((lp0 -VJelmer Vernooij <jelmer@samba.org> -p1 -aVDaniel Schierbeck <daniel.schierbeck@gmail.com> -p2 -aVSzilveszter Farkas (Phanatic) <Szilveszter.Farkas@gmail.com> -p3 -aVGary van der Merwe <garyvdm@gmail.com> -p4 -aVJasper Groenewegen <colbrac@xs4all.nl> -p5 -aVVincent Ladeuil <v.ladeuil+lp@free.fr> -p6 -aVJohn Arbash Meinel <john@arbash-meinel.com> -p7 -aVAaron Bentley <abentley@panoramicfeedback.com> -p8 -aVAaron Bentley <aaron@aaronbentley.com> -p9 -aVAlexander Belchenko <bialix@ukr.net> -p10 -aVDavid Allouche <david.allouche@canonical.com> -p11 -aVDan Loda <danloda@gmail.com> -p12 -aVAaron Bentley <aaron.bentley@utoronto.ca> -p13 -aVScott James Remnant <scott@netsplit.com> -p14 -aVScott Scriven <ubuntu@toykeeper.net> -p15 -aVMateusz Korniak <matkor@laptop-hp> -p16 -aVRobert Collins <robertc@robertcollins.net> -p17 -aVSzilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com> -p18 -aVMartin Albisetti <argentina@gmail.com> -p19 -aVSabin Iacob (m0n5t3r) <iacobs@m0n5t3r.info> -p20 -aVJavier Derderian <javierder@gmail.com> -p21 -aVjbailey@ubuntu.com -p22 -aVGary van der Merwe <garyvdm@garyvdm-desktop> -p23 -aVRichard Ferguson <ubuntu@fergusnet.com> -p24 -aVMartin Pool <mbp@canonical.com> -p25 -aVElliot Murphy <elliot@elliotmurphy.com> -p26 -aVAdeodato Simó <dato@net.com.org.es> -p27 -aVv.ladeuil+lp@free.fr -p28 -aVSzilveszter Farkas <szilveszter.farkas@gmail.com> -p29 -aVWouter van Heyst <larstiq@larstiq.dyndns.org> -p30 -aVTorsten Landschoff <torsten@debian.org> -p31 -aVJamie Wilkinson <jaq@spacepants.org> -p32 -aVGediminas Paulauskas <menesis@pov.lt> -p33 -aVAli Sabil <ali.sabil@gmail.com> -p34 -aVAdrian Wilkins <adrian.wilkins@gmail.com> -p35 -aVMichael Ellerman <michael@ellerman.id.au> -p36 -aVMateusz Korniak (matkor@laptop-hp) -p37 -aVJelmer Vernooij <Jelmer Vernooij@LENOVO-C29B82CD> -p38 -aVFarkas Szilveszter <szilveszter@szilveszter-desktop> -p39 -aVDaniel Schömer <daniel.schoemer@gmx.net> -p40 -aVChris Lamb <chris@chris-lamb.co.uk> -p41 -aVChad MILLER <chad@mysql.com> -p42 -aVrodney.dawes@canonical.com -p43 -aVmatkor <matkor@laptop-hp> -p44 -aVklight@walkertechnical.com -p45 -aVklight <klight@X111> -p46 -aVVincent Geddes <vincent.geddes@gmail.com> -p47 -aVToshio Kuratomi <toshio@fedoraproject.org> -p48 -aVTom Badran <tom@badrunner.net> -p49 -aVSzilveszter Farkas <szilveszter@MacBookPro.local> -p50 -aVStéphane Raimbault <stephane.raimbault@gmail.com> -p51 -aVScott James Remnant <scott@ubuntu.com> -p52 -aVRuss Brown <pickscrape@gmail.com> -p53 -aVRichard Ferguson <fergus@fergusnet.com> -p54 -aVRene Huber <rhuber@ubuntu> -p55 -aVPelle Johansson <pelle@blocket.se> -p56 -aVMichael Vogt <michael.vogt@ubuntu.com> -p57 -aVMathias Brodala <info@noctus.net> -p58 -aVMarkus Korn <thekorn@gmx.de> -p59 -aVMario Danic <mario.danic@gmail.com> -p60 -aVLucas Shrewsbury <rollbak@gmail.com> -p61 -aVKevin Light <klight@walkertechnical.com> -p62 -aVJohn Szakmeister <john@szakmeister.net> -p63 -aVJean-François Fortin Tam <jeff@ecchi.ca> -p64 -aVJasper Groenewegen <colbrac@xs4al.nl> -p65 -aVJames Westby <jw+debian@jameswestby.net> -p66 -aVJames Henstridge <james@jamesh.id.au> -p67 -aVErik Bagfors <erik@bagfors.nu> -p68 -aVDennis Miller <millerdl@telusplanet.net> -p69 -aVAndrew Starr-Bochicchio <a.starr.b@gmail.com> -p70 -aVAndrew Bennetts <andrew@puzzling.org> -p71 -aVAlexandre Défossez <alexandre.defossez@gmail.com> -p72 -aVAdrian Room <ingolemo@gmail.com> -p73 -a(lp74 -g1 -ag3 -ag6 -ag2 -ag12 -ag4 -ag27 -ag50 -ag29 -ag15 -ag14 -ag66 -ag44 -ag22 -ag49 -aVSense Hofstede <qense@ubuntu.com> -p75 -ag52 -ag53 -ag17 -ag16 -ag25 -ag19 -ag61 -aVKiddo <nekohayo@gmail.com> -p76 -ag62 -ag63 -ag38 -ag5 -ag23 -ag11 -ag8 -a(lp77 -g3 -ag2 -ag19 -ag61 -ag1 -a(lp78 -g3 -ag18 -ag51 -atp79 -.
\ No newline at end of file diff --git a/dev-vcs/bzr-gtk/metadata.xml b/dev-vcs/bzr-gtk/metadata.xml deleted file mode 100644 index d167356cecbd..000000000000 --- a/dev-vcs/bzr-gtk/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription lang="en"> - GTK+ Frontends to various Bazaar commands. Currently contains - dialogs for almost all common operations, including annotate and - visualise (log). Olive, the integrated version control application - is also part of bzr-gtk. - </longdescription> - <use> - <flag name="gpg">Support signing with GnuPG.</flag> - <flag name="nautilus">Integrate with Nautilus file manager</flag> - </use> - <upstream> - <remote-id type="launchpad">bzr-gtk</remote-id> - </upstream> -</pkgmetadata> diff --git a/games-emulation/gxmame/Manifest b/games-emulation/gxmame/Manifest deleted file mode 100644 index 7c51c79eb2b5..000000000000 --- a/games-emulation/gxmame/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gxmame-0.35beta2.tar.gz 697013 BLAKE2B 8c7396d716d6fded1c2bd3efbc5a90fc8c1835221c208f0e807b50044a2d9d6b392fa27349d9a7a51bcedf20544ff87940a2866fe4d6d6644c80d33aaa56bbe2 SHA512 c2b47c1f3f76d86846302754b31954b81d5b7165f5778153c6e6285bdcc6040c5479009cd70dcf32c86afa245ae8b6fe98af781f0d51acfcb76c8deb76422fe2 diff --git a/games-emulation/gxmame/files/gxmame-0.35_beta2-glib-single-include.patch b/games-emulation/gxmame/files/gxmame-0.35_beta2-glib-single-include.patch deleted file mode 100644 index 83ef4aa075e5..000000000000 --- a/games-emulation/gxmame/files/gxmame-0.35_beta2-glib-single-include.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gxmame-0.35beta2/src/gxmame.c -=================================================================== ---- gxmame-0.35beta2.orig/src/gxmame.c -+++ gxmame-0.35beta2/src/gxmame.c -@@ -31,7 +31,7 @@ - #include <unistd.h> - #include <signal.h> - #include <glib/gprintf.h> --#include <glib/gutils.h> -+#include <glib.h> - #include <gtk/gtkmain.h> - #include <gtk/gtkfilesel.h> - diff --git a/games-emulation/gxmame/files/gxmame-0.35_beta2-ovflfix.patch b/games-emulation/gxmame/files/gxmame-0.35_beta2-ovflfix.patch deleted file mode 100644 index 8831a3e09b61..000000000000 --- a/games-emulation/gxmame/files/gxmame-0.35_beta2-ovflfix.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- src/options.c.old 2010-12-01 10:48:45.000000000 +0100 -+++ src/options.c 2010-12-01 10:53:55.000000000 +0100 -@@ -4245,7 +4245,7 @@ - case XMAME_EXEC_SVGAFX: - target->fxgkeepaspect = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fxgkeepaspect_checkbutton)); - used_text = gtk_editable_get_chars (GTK_EDITABLE (fx_entry), 0, -1); -- strncpy (target->resolution, used_text, 20); -+ strncpy (target->resolution, used_text, sizeof(target->resolution)); - g_free (used_text); - break; - -@@ -4330,7 +4330,7 @@ - } - - used_text = gtk_editable_get_chars (GTK_EDITABLE (soundfile_entry), 0, -1); -- strncpy (target->soundfile, used_text, 50); -+ strncpy (target->soundfile, used_text, sizeof(target->soundfile)); - g_free (used_text); - - target->timer = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (timer_checkbutton)); -@@ -4465,7 +4465,7 @@ - target->skip_disclaimer = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (disclaimer_checkbutton)); - target->skip_gameinfo = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gameinfo_checkbutton)); - used_text = gtk_editable_get_chars (GTK_EDITABLE (debug_size_combo_entry), 0, -1); -- strncpy (target->debug_size, used_text, 20); -+ strncpy (target->debug_size, used_text, sizeof(target->debug_size)); - g_free (used_text); - target->use_additional_options = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (additional_options_checkbutton)); - /* here I'm using directly the additional option because I don't know its length */ diff --git a/games-emulation/gxmame/gxmame-0.35_beta2.ebuild b/games-emulation/gxmame/gxmame-0.35_beta2.ebuild deleted file mode 100644 index 58080b943381..000000000000 --- a/games-emulation/gxmame/gxmame-0.35_beta2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils games - -MY_P="${PN}-${PV/_beta/beta}" -DESCRIPTION="frontend for XMame using the GTK library" -HOMEPAGE="http://gxmame.sourceforge.net/" -SRC_URI="mirror://sourceforge/gxmame/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="nls joystick" - -RDEPEND="dev-libs/expat - >=x11-libs/gtk+-2.4:2 - >=dev-libs/glib-2.4:2 - x11-themes/gnome-icon-theme - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-glib-single-include.patch \ - "${FILESDIR}"/${P}-ovflfix.patch - sed -i \ - -e "s:-O2 -fomit-frame-pointer -ffast-math:${CFLAGS}:" \ - -e "s:-O2:${CFLAGS}:" \ - configure || die - sed -i \ - -e '/Icon/s/\.png//' \ - -e '/Categories/s/Application;//' \ - gxmame.desktop.in || die - sed -i \ - -e 's:COPYING::' \ - -e "s:^docdir = .*:docdir = /usr/share/doc/${PF}:" \ - -e "s:^htmldir = .*:htmldir = /usr/share/doc/${PF}/html:" \ - -e "s:^icondir = .*:icondir = /usr/share/icons:" \ - -e "s:^pixmapdir = .*:pixmapdir = /usr/share/pixmaps:" \ - -e "s:^gnulocaledir = .*:gnulocaledir = /usr/share/locale:" \ - -e "s:^icon2dir = .*:icon2dir = /usr/share/icons/mini:" \ - -e "s:^Graphicsdir = .*:Graphicsdir = /usr/share/applications:" \ - -e "/DDATADIR/s:\$(datadir):/usr/share/pixmaps:" \ - -e "/DPACKAGE_LOCALE_DIR/s:\$(datadir):/usr/share:" \ - Makefile.in html/Makefile.in src/Makefile.in po/Makefile.in.in || die - sed -i -e 's/"gxmame"/""/' src/gui.c || die -} - -src_configure() { - egamesconf \ - --with-xmame-dir="${GAMES_DATADIR}"/xmame \ - $(use_enable nls) \ - $(use_enable joystick) -} - -src_install() { - DOCS="AUTHORS BUGS ChangeLog NEWS README TODO" \ - default - prepgamesdirs -} diff --git a/games-emulation/gxmame/metadata.xml b/games-emulation/gxmame/metadata.xml deleted file mode 100644 index e5c3f321f04a..000000000000 --- a/games-emulation/gxmame/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>games@gentoo.org</email> - <name>Gentoo Games Project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">gxmame</remote-id> - </upstream> -</pkgmetadata> diff --git a/media-libs/libmatroska/libmatroska-1.4.8.ebuild b/media-libs/libmatroska/libmatroska-1.4.8.ebuild index ae166a1913ba..1da3fb754fc6 100644 --- a/media-libs/libmatroska/libmatroska-1.4.8.ebuild +++ b/media-libs/libmatroska/libmatroska-1.4.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0/6" # subslot = soname major version -KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" +KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" IUSE="static-libs" RDEPEND=">=dev-libs/libebml-1.3.4:=" diff --git a/media-video/mkvtoolnix/mkvtoolnix-19.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-19.0.0.ebuild index f0e294854bdb..8830cd670aae 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-19.0.0.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-19.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz" - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" + KEYWORDS="~amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" fi DESCRIPTION="Tools to create, alter, and inspect Matroska files" diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.15.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.15.1.ebuild index d83c3297cadf..58ed3be69a99 100644 --- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.15.1.ebuild +++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.15.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2010-2017 Gentoo Foundation +# Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ DESCRIPTION="Bitcoin Core consensus library" HOMEPAGE="http://bitcoincore.org/ http://bitcoinknots.org/" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux" SRC_URI=" https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild index a63af598ca66..e143f8a4489f 100644 --- a/net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild +++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2010-2017 Gentoo Foundation +# Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ DESCRIPTION="Command-line JSON-RPC client specifically for interfacing with bitc HOMEPAGE="http://bitcoincore.org/ http://bitcoinknots.org/" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux" SRC_URI=" https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild index 75bc2d1f74f2..864deba6ffd4 100644 --- a/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild +++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild @@ -21,7 +21,7 @@ DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency" HOMEPAGE="http://bitcoincore.org/ http://bitcoinknots.org/" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux" SRC_URI=" https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz diff --git a/net-p2p/bitcoind/bitcoind-0.15.1.ebuild b/net-p2p/bitcoind/bitcoind-0.15.1.ebuild index 3d8c5eb306c1..0d8788ad457a 100644 --- a/net-p2p/bitcoind/bitcoind-0.15.1.ebuild +++ b/net-p2p/bitcoind/bitcoind-0.15.1.ebuild @@ -19,7 +19,7 @@ DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services" HOMEPAGE="http://bitcoincore.org/ http://bitcoinknots.org/" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux" SRC_URI=" https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz diff --git a/net-wireless/iw/iw-4.9.ebuild b/net-wireless/iw/iw-4.9.ebuild index f43f3e9fbd79..f9a771d3839a 100644 --- a/net-wireless/iw/iw-4.9.ebuild +++ b/net-wireless/iw/iw-4.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz" LICENSE="ISC" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="dev-libs/libnl" diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 9fc4a4c7d158..ff5cb51e522b 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -212,10 +212,6 @@ dev-vcs/rabbitvcs gedit # Multiple test failures. sys-boot/grub:2 test -# Ulrich Müller <ulm@gentoo.org> (4 Feb 2017) -# Uses old and vulnerable net-libs/webkit-gtk:3, bug #584156. -app-editors/emacs:25 xwidgets - # Ian Stakenvicius (25 Jan 2017) # rust on mozilla packages is experimental www-client/firefox rust diff --git a/profiles/updates/1Q-2016 b/profiles/updates/1Q-2016 index 549d6cfdd87f..8d28a9e60438 100644 --- a/profiles/updates/1Q-2016 +++ b/profiles/updates/1Q-2016 @@ -3,8 +3,6 @@ move x11-apps/xtitle x11-misc/xtitle move kde-base/kde-meta kde-apps/kde-meta move dev-perl/Unicode-Normalize perl-core/Unicode-Normalize move media-video/nvenc media-video/nvidia_video_sdk -move x11-apps/ccsm x11-misc/ccsm -move x11-apps/simple-ccsm x11-misc/simple-ccsm move dev-python/socksipy dev-python/PySocks slotmove <sci-libs/libint-2 0 1 slotmove >=sci-libs/libint-2 0 2 diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest deleted file mode 100644 index b99080cd00a6..000000000000 --- a/sci-visualization/qtiplot/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST qtiplot-0.9.8.9-origin.patch.bz2 104708 BLAKE2B 38993180a33ae2d5c4e7f2adbfabe54efb5abebb6eb678edc6a0d40f9ad552e3fac2a99be9b6793001cf880f2445751435fb3476be24a41fb769a8ffe6d0e7d9 SHA512 62f5bb531c2fc7e061661ab5733a70acf9a61ff90a934af42b5741c63478caebabc8240f37d25660f623c5cbcd530e1303e967a095ca99b3452f29cfb5200b69 -DIST qtiplot-0.9.8.9-origin.patch.xz 89660 BLAKE2B 77b9808173300a65f950ff1e15ba66271ec5bb45f147bb4707b881ec3987c22a35c9fb07c78f2f3205b252ae7f336d8a7d83eba57b96ff5510c65ef051a6a089 SHA512 adbd002975bb49997eb610b150c1bbfe9c9617b0b5bbb70f52df7475339b7d68cada175eb9f6048f6ece043ca3dcf5c62ef361d82bc670b1576ee8493d6b757c -DIST qtiplot-0.9.8.9.tar.bz2 16202943 BLAKE2B ce7efb424da293f8770a90d9c4346c9c709d98605a726e466e2c85a8b1b8db2b519c3e7c719077c14aeed71e9696194e3b5acf075ebc052fe6be88a887fae7fd SHA512 3a0cb7b49c508f56228e8e3a259b4fd34c872410ad14ef1d8656372e3e8ab9f92e59094a9cc1a75680099a8832f7472ad31462b3ae8a9e132ac7056d5245cf2a diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-dont-install-qwt.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-dont-install-qwt.patch deleted file mode 100644 index 86e4d4c6a9c1..000000000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-dont-install-qwt.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/3rdparty/qwt/qwtconfig.pri b/3rdparty/qwt/qwtconfig.pri -index b7d0d0e..e36f131 100755 ---- a/3rdparty/qwt/qwtconfig.pri -+++ b/3rdparty/qwt/qwtconfig.pri -@@ -7,17 +7,6 @@ VER_MIN = 2 - VER_PAT = 0
- VERSION = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
-
--unix {
-- INSTALLBASE = /usr/local/qwt-5.2.0
--}
--
--win32 {
-- INSTALLBASE = C:/Qwt-5.2.0
--}
--
--target.path = $$INSTALLBASE/lib
--headers.path = $$INSTALLBASE/include
--doc.path = $$INSTALLBASE/doc
-
- ######################################################################
- # qmake internal options
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-gold.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-gold.patch deleted file mode 100644 index 3b6757533a52..000000000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-gold.patch +++ /dev/null @@ -1,15 +0,0 @@ - qtiplot/qtiplot.pro | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro -index 99e0e36..b7cf373 100755 ---- a/qtiplot/qtiplot.pro -+++ b/qtiplot/qtiplot.pro -@@ -20,6 +20,7 @@ LIBS += $$MUPARSER_LIBS - LIBS += $$QWT_LIBS - LIBS += $$QWT3D_LIBS - LIBS += $$GSL_LIBS -+LIBS += -lz - - ############################################################################# - ###################### BASIC PROJECT PROPERTIES ############################# diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.7-kde.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.7-kde.patch deleted file mode 100644 index af1dca42da42..000000000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.7-kde.patch +++ /dev/null @@ -1,16 +0,0 @@ - qtiplot/src/plot2D/Graph.cpp | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/qtiplot/src/plot2D/Graph.cpp b/qtiplot/src/plot2D/Graph.cpp -index 626172a..d4eab1b 100755 ---- a/qtiplot/src/plot2D/Graph.cpp -+++ b/qtiplot/src/plot2D/Graph.cpp -@@ -73,7 +73,8 @@ - #include <PatternBox.h> - #include <SymbolBox.h> - #include <LinearColorMap.h> - -+#include <QPaintEngine> - #include <QApplication> - #include <QBitmap> - #include <QClipboard> diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.8-system-gl2ps.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.8-system-gl2ps.patch deleted file mode 100644 index d7b40c414b1d..000000000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.8-system-gl2ps.patch +++ /dev/null @@ -1,76 +0,0 @@ - 3rdparty/qwtplot3d/qwtplot3d.pri | 8 ++++---- - 3rdparty/qwtplot3d/qwtplot3d.pro | 3 --- - 3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp | 2 +- - 3rdparty/qwtplot3d/src/qwt3d_label.cpp | 2 +- - 4 files changed, 6 insertions(+), 9 deletions(-) - -diff --git a/3rdparty/qwtplot3d/qwtplot3d.pri b/3rdparty/qwtplot3d/qwtplot3d.pri -index 45a0c3e..16bbe53 100755 ---- a/3rdparty/qwtplot3d/qwtplot3d.pri -+++ b/3rdparty/qwtplot3d/qwtplot3d.pri -@@ -8,6 +8,8 @@ DEPENDPATH += src \ - 3rdparty\gl2ps - INCLUDEPATH += . - -+LIBS+=-lgl2ps -+ - # Input - HEADERS += include/qwt3d_extglwidget.h \ - include/qwt3d_color.h \ -@@ -37,8 +39,7 @@ HEADERS += include/qwt3d_extglwidget.h \ - include/qwt3d_volumeplot.h \ - include/qwt3d_graphplot.h \ - include/qwt3d_multiplot.h \ -- include/qwt3d_io_gl2ps.h \ -- 3rdparty/gl2ps/gl2ps.h -+ include/qwt3d_io_gl2ps.h - SOURCES += src/qwt3d_extglwidget.cpp \ - src/qwt3d_axis.cpp \ - src/qwt3d_color.cpp \ -@@ -62,5 +63,4 @@ SOURCES += src/qwt3d_extglwidget.cpp \ - src/qwt3d_function.cpp \ - src/qwt3d_gridplot.cpp \ - src/qwt3d_meshplot.cpp \ -- src/qwt3d_io_gl2ps.cpp \ -- 3rdparty/gl2ps/gl2ps.c -+ src/qwt3d_io_gl2ps.cpp -diff --git a/3rdparty/qwtplot3d/qwtplot3d.pro b/3rdparty/qwtplot3d/qwtplot3d.pro -index 95c8e26..18d03e3 100755 ---- a/3rdparty/qwtplot3d/qwtplot3d.pro -+++ b/3rdparty/qwtplot3d/qwtplot3d.pro -@@ -31,9 +31,6 @@ RCC_DIR = $$DESTDIR/tmp - MOC_DIR = $$DESTDIR/tmp
-
- DEFINES += GL2PS_HAVE_LIBPNG
--INCLUDEPATH += ../zlib/
--INCLUDEPATH += ../libpng/
--LIBS += ../libpng/libpng.a
-
- # install
- target.path = lib
-diff --git a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp -index bc7a9d8..589cfd2 100755 ---- a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp -+++ b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp -@@ -6,7 +6,7 @@ - #include <locale.h> - - #include "qwt3d_openglhelper.h" --#include "../3rdparty/gl2ps/gl2ps.h" -+#include "gl2ps.h" - #include "qwt3d_io_gl2ps.h" - #include "qwt3d_plot.h" - -diff --git a/3rdparty/qwtplot3d/src/qwt3d_label.cpp b/3rdparty/qwtplot3d/src/qwt3d_label.cpp -index 7e54ad9..cc8bd60 100755 ---- a/3rdparty/qwtplot3d/src/qwt3d_label.cpp -+++ b/3rdparty/qwtplot3d/src/qwt3d_label.cpp -@@ -1,7 +1,7 @@ - #include <qbitmap.h> - #include "qwt3d_label.h" - #include "qwt3d_plot.h" --#include "../3rdparty/gl2ps/gl2ps.h" -+#include "gl2ps.h" - - using namespace Qwt3D; - diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.10.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.10.patch deleted file mode 100644 index 67bd0a32d105..000000000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.10.patch +++ /dev/null @@ -1,32 +0,0 @@ - qtiplot/python-sipcmd.py | 21 ++++++++++++++++++--- - 1 file changed, 18 insertions(+), 3 deletions(-) - -diff --git a/qtiplot/python-sipcmd.py b/qtiplot/python-sipcmd.py -index f643194..d8d1ef2 100755 ---- a/qtiplot/python-sipcmd.py -+++ b/qtiplot/python-sipcmd.py -@@ -27,6 +27,21 @@ - # # - ############################################################################ - --from PyQt4 import pyqtconfig --config = pyqtconfig.Configuration() --print " ".join([config.sip_bin, "-I", config.pyqt_sip_dir, config.pyqt_sip_flags]) -+from __future__ import print_function -+ -+import os -+import sipconfig -+import PyQt4.QtCore -+ -+try: -+ # >= 4.10 -+ SIP_FLAGS = PyQt4.QtCore.PYQT_CONFIGURATION['sip_flags'] -+except: -+ import PyQt4.pyqtconfig -+ SIP_FLAGS = PyQt4.pyqtconfig.Configuration().pyqt_sip_flags -+ -+PYQT_SIP_DIR = os.path.join(sipconfig.Configuration().default_sip_dir) -+SIP_BIN = sipconfig.Configuration().sip_bin -+SIP_INC_DIR = sipconfig.Configuration().sip_inc_dir -+ -+print(" ".join([SIP_BIN, "-I", PYQT_SIP_DIR, SIP_FLAGS])) diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.11.3.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.11.3.patch deleted file mode 100644 index a011782550d6..000000000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.11.3.patch +++ /dev/null @@ -1,32 +0,0 @@ - qtiplot/python-sipcmd.py | 21 ++++++++++++++++++--- - 1 file changed, 18 insertions(+), 3 deletions(-) - -diff --git a/qtiplot/python-sipcmd.py b/qtiplot/python-sipcmd.py -index f643194..d8d1ef2 100755 ---- a/qtiplot/python-sipcmd.py -+++ b/qtiplot/python-sipcmd.py -@@ -27,6 +27,21 @@ - # # - ############################################################################ - --from PyQt4 import pyqtconfig --config = pyqtconfig.Configuration() --print " ".join([config.sip_bin, "-I", config.pyqt_sip_dir, config.pyqt_sip_flags]) -+from __future__ import print_function -+ -+import os -+import sipconfig -+import PyQt4.QtCore -+ -+try: -+ # >= 4.10 -+ SIP_FLAGS = PyQt4.QtCore.PYQT_CONFIGURATION['sip_flags'] -+except: -+ import PyQt4.pyqtconfig -+ SIP_FLAGS = PyQt4.pyqtconfig.Configuration().pyqt_sip_flags -+ -+PYQT_SIP_DIR = os.path.join(sipconfig.Configuration().default_sip_dir, 'PyQt4') -+SIP_BIN = sipconfig.Configuration().sip_bin -+SIP_INC_DIR = sipconfig.Configuration().sip_inc_dir -+ -+print(" ".join([SIP_BIN, "-I", PYQT_SIP_DIR, SIP_FLAGS])) diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-adopt_to_alglib3.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-adopt_to_alglib3.patch deleted file mode 100644 index 8f1bde25a038..000000000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-adopt_to_alglib3.patch +++ /dev/null @@ -1,115 +0,0 @@ -Description: adoptation to alglib3. -Author: Anton Gladky <gladk@debian.org> -Last-Update: 2013-05-16 - ---- a/qtiplot/src/analysis/dialogs/GriddingDialog.cpp -+++ b/qtiplot/src/analysis/dialogs/GriddingDialog.cpp -@@ -41,7 +41,7 @@ - #include <QComboBox> - #include <QLayout> - --#include <idwint.h> -+#include <interpolation.h> - - GriddingDialog::GriddingDialog(Table* t, const QString& colName, int nodes, QWidget* parent, Qt::WFlags fl ) - : QDialog( parent, fl ), -@@ -365,26 +365,27 @@ - Matrix* m = app->newMatrix(rows, cols); - m->setCoordinates(xmin, xmax, ymin, ymax); - -- idwinterpolant z; -+ alglib::idwinterpolant z; -+ - switch (boxMethod->currentIndex()){ - case 0: -- idwbuildmodifiedshepardr(xy, d_nodes, 2, boxRadius->value(), z); -+ alglib::idwbuildmodifiedshepardr(xy, d_nodes, 2, boxRadius->value(), z); - break; - case 1: -- idwbuildmodifiedshepard(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z); -+ alglib::idwbuildmodifiedshepard(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z); - break; - case 2: -- idwbuildnoisy(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z); -+ alglib::idwbuildnoisy(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z); - break; - } - -- ap::real_1d_array p; -+ alglib::real_1d_array p; - p.setlength(2); - for (int i = 0; i < rows; i++){ - p(1) = ymin + i*ystep; - for (int j = 0; j < cols; j++){ - p(0) = xmin + j*xstep; -- m->setCell(i, j, idwcalc(z, p)); -+ m->setCell(i, j, alglib::idwcalc(z, p)); - } - } - -@@ -435,20 +436,20 @@ - double xstep = fabs(xmax - xmin)/(cols - 1); - double ystep = fabs(ymax - ymin)/(rows - 1); - -- idwinterpolant z; -+ alglib::idwinterpolant z; - switch (boxMethod->currentIndex()){ - case 0: -- idwbuildmodifiedshepardr(xy, d_nodes, 2, boxRadius->value(), z); -+ alglib::idwbuildmodifiedshepardr(xy, d_nodes, 2, boxRadius->value(), z); - break; - case 1: -- idwbuildmodifiedshepard(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z); -+ alglib::idwbuildmodifiedshepard(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z); - break; - case 2: -- idwbuildnoisy(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z); -+ alglib::idwbuildnoisy(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z); - break; - } - -- ap::real_1d_array p; -+ alglib::real_1d_array p; - p.setlength(2); - - double **data_matrix = Matrix::allocateMatrixData(cols, rows); -@@ -456,7 +457,7 @@ - p(1) = ymin + i*ystep; - for (int j = 0; j < cols; j++){ - p(0) = xmin + j*xstep; -- data_matrix[j][i] = idwcalc(z, p); -+ data_matrix[j][i] = alglib::idwcalc(z, p); - } - } - ---- a/qtiplot/src/analysis/dialogs/GriddingDialog.h -+++ b/qtiplot/src/analysis/dialogs/GriddingDialog.h -@@ -71,7 +71,7 @@ - - QString d_col_name; - int d_nodes; -- ap::real_2d_array xy; -+ alglib::real_2d_array xy; - - QPushButton* buttonFit; - QPushButton* buttonCancel; ---- a/qtiplot/src/matrix/MatrixModel.cpp -+++ b/qtiplot/src/matrix/MatrixModel.cpp -@@ -45,7 +45,7 @@ - #include <stdlib.h> - - #ifdef HAVE_ALGLIB -- #include <spline2d.h> -+ #include <interpolation.h> - #endif - - MatrixModel::MatrixModel(int rows, int cols, QObject *parent) -@@ -1026,7 +1026,7 @@ - #ifdef HAVE_ALGLIB - QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); - -- ap::real_2d_array oldValues, newValues; -+ alglib::real_2d_array oldValues, newValues; - oldValues.setlength(d_rows, d_cols); - newValues.setlength(rows, cols); - diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-crasher_without_internet.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-crasher_without_internet.patch deleted file mode 100644 index fe542341e99d..000000000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-crasher_without_internet.patch +++ /dev/null @@ -1,25 +0,0 @@ -Description: Crashes if not connected to the internet. -Author: Scott Howard <showard@debian.org> -Bug-Debian: http://bugs.debian.org/626915 - -Index: qtiplot/qtiplot/src/core/ApplicationWindow.cpp -=================================================================== ---- qtiplot.orig/qtiplot/src/core/ApplicationWindow.cpp 2012-11-07 11:14:15.021706679 -0500 -+++ qtiplot/qtiplot/src/core/ApplicationWindow.cpp 2012-11-07 11:14:22.853706641 -0500 -@@ -16228,11 +16228,12 @@ - if (hostInfo.error() != QHostInfo::NoError){ - QApplication::restoreOverrideCursor(); - QMessageBox::critical(this, tr("QtiPlot - Error"), qtiplotWeb + ": " + hostInfo.errorString()); -- exit(0); -+ QApplication::restoreOverrideCursor(); -+ } -+ else { -+ QApplication::restoreOverrideCursor(); -+ showDonationsPage(); - } -- -- QApplication::restoreOverrideCursor(); -- showDonationsPage(); - } - - void ApplicationWindow::parseCommandLineArguments(const QStringList& args) diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-gsl-2.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-gsl-2.patch deleted file mode 100644 index 9ad891938cd6..000000000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-gsl-2.patch +++ /dev/null @@ -1,36 +0,0 @@ - * Info: Using [gentoo] (https://bugs.gentoo.org/xmlrpc.cgi) - * Info: Getting attachment 425760 - * Info: Viewing attachment: "fix_fit_gsl_fdfsolver.patch" -diff --git a/qtiplot/src/analysis/Fit.cpp b/qtiplot/src/analysis/Fit.cpp -index 22cb5be..555f21d 100755 ---- a/qtiplot/src/analysis/Fit.cpp -+++ b/qtiplot/src/analysis/Fit.cpp -@@ -106,6 +106,7 @@ void Fit::init() - gsl_multifit_fdfsolver * Fit::fitGSL(gsl_multifit_function_fdf f, int &iterations, int &status) - { - const gsl_multifit_fdfsolver_type *T; -+ gsl_matrix *J; - if (d_solver) - T = gsl_multifit_fdfsolver_lmder; - else -@@ -128,7 +129,8 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl_multifit_function_fdf f, int &iteration - } - - if (status){ -- gsl_multifit_covar (s->J, 0.0, covar); -+ gsl_multifit_fdfsolver_jac (s, J); -+ gsl_multifit_covar (J, 0.0, covar); - iterations = 0; - return s; - } -@@ -155,7 +157,8 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl_multifit_function_fdf f, int &iteration - status = gsl_multifit_test_delta (s->dx, s->x, d_tolerance, d_tolerance); - } while (inRange && status == GSL_CONTINUE && (int)iter < d_max_iterations); - -- gsl_multifit_covar (s->J, 0.0, covar); -+ gsl_multifit_fdfsolver_jac (s, J); -+ gsl_multifit_covar (J, 0.0, covar); - - iterations = iter; - return s; - diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-origin-2.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-origin-2.patch deleted file mode 100644 index d85420b790f4..000000000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-origin-2.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -ruN qtiplot-0.9.8.9-origin/qtiplot/exportEMF.pro qtiplot-0.9.8.9/qtiplot/exportEMF.pro ---- qtiplot-0.9.8.9-origin/qtiplot/exportEMF.pro 2012-01-21 20:39:03.000000000 +0100 -+++ qtiplot-0.9.8.9/qtiplot/exportEMF.pro 2012-01-21 20:32:45.000000000 +0100 -@@ -5,6 +5,7 @@ - - INCLUDEPATH += $$QWT_INCLUDEPATH - INCLUDEPATH += $$GSL_INCLUDEPATH -+INCLUDEPATH += $$EMF_INCLUDEPATH - - include(src/core/core.pri) - include(src/lib/libqti.pri) -diff -ruN qtiplot-0.9.8.9-origin/qtiplot/qtiplot.pro qtiplot-0.9.8.9/qtiplot/qtiplot.pro ---- qtiplot-0.9.8.9-origin/qtiplot/qtiplot.pro 2011-11-07 10:17:21.000000000 +0100 -+++ qtiplot-0.9.8.9/qtiplot/qtiplot.pro 2012-01-21 20:44:11.000000000 +0100 -@@ -236,9 +236,9 @@ - ############################################################### - - TARGET = qtiplot --DESTDIR = ../ -+DESTDIR = ./ - LIBS += ../tmp/qtiplot/libFreeSoftwareQtiPlotExportEMF.a \ - ../tmp/qtiplot/libFreeSoftwareQtiPlotImportOPJ.a - - include(src/plugins/exportEMF/exportEMF.pri) --include(src/plugins/OriginPlugin/OriginPlugin.pri) -\ Kein Zeilenumbruch am Dateiende. -+include(src/plugins/OriginPlugin/OriginPlugin.pri) -diff -ruN qtiplot-0.9.8.9-origin/qtiplot/src/plugins/exportEMF/exportEMF.pri qtiplot-0.9.8.9/qtiplot/src/plugins/exportEMF/exportEMF.pri ---- qtiplot-0.9.8.9-origin/qtiplot/src/plugins/exportEMF/exportEMF.pri 2011-10-27 13:44:34.000000000 +0200 -+++ qtiplot-0.9.8.9/qtiplot/src/plugins/exportEMF/exportEMF.pri 2012-01-21 20:51:34.000000000 +0100 -@@ -10,5 +10,5 @@ - SOURCES += src/plugins/exportEMF/exportEMF.cpp \ - src/plugins/exportEMF/3rdparty/EmfEngine/src/EmfEngine.cpp \ - src/plugins/exportEMF/3rdparty/EmfEngine/src/EmfPaintDevice.cpp -- --LIBS += -lgdi32 -+ -+LIBS += -lEMF diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-private.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-private.patch deleted file mode 100644 index 7bec3771813c..000000000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-private.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ruN qtiplot-0.9.8.9.orig/qtiplot/src/plot2D/ImageWidget.h qtiplot-0.9.8.9/qtiplot/src/plot2D/ImageWidget.h ---- qtiplot-0.9.8.9.orig/qtiplot/src/plot2D/ImageWidget.h 2010-10-17 09:04:05.000000000 +0200 -+++ qtiplot-0.9.8.9/qtiplot/src/plot2D/ImageWidget.h 2013-11-01 12:11:36.559973891 +0100 -@@ -67,10 +67,10 @@ - void setWindowName(const QString& name){d_window_name = name;}; - - static QPixmap windowPixmap(ApplicationWindow *mw, const QString& name, const QSize& size); -+ void paintEvent(QPaintEvent *e); - - private: - void draw(QPainter *painter, const QRect& r); -- void paintEvent(QPaintEvent *e); - QPixmap d_pix; - //! The file from which the image was loaded. - QString d_file_name; diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-qt48.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-qt48.patch deleted file mode 100644 index 31c8a5ee7af2..000000000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-qt48.patch +++ /dev/null @@ -1,29 +0,0 @@ - 3rdparty/qwtplot3d/include/qwt3d_openglhelper.h | 2 ++ - qtiplot/src/plot3D/Cone3D.cpp | 1 + - 2 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h b/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h -index 0ee80de..3d02e3f 100755 ---- a/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h -+++ b/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h -@@ -8,6 +8,8 @@ - #include <QtOpenGL/qgl.h> - #endif - -+#include <GL/glu.h> -+ - namespace Qwt3D - { - -diff --git a/qtiplot/src/plot3D/Cone3D.cpp b/qtiplot/src/plot3D/Cone3D.cpp -index 16df12d..169d5c7 100755 ---- a/qtiplot/src/plot3D/Cone3D.cpp -+++ b/qtiplot/src/plot3D/Cone3D.cpp -@@ -27,6 +27,7 @@ - * * - ***************************************************************************/ - #include <math.h> -+#include <GL/glu.h> - #include "qwt3d_color.h" - #include "qwt3d_plot.h" - #include <qwt3d_curve.h> diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-set_col_values.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-set_col_values.patch deleted file mode 100644 index 5afe43eb3daf..000000000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-set_col_values.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: if you don't initialize the "i" variable, or initialize it to 0.0 - qtiplot won't let you set the column values using muparser. -Author: Scott Howard <showard@debian.org> -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707736 - -Index: qtiplot/qtiplot/src/table/Table.cpp -=================================================================== ---- qtiplot.orig/qtiplot/src/table/Table.cpp 2013-06-08 02:06:35.550201324 -0400 -+++ qtiplot/qtiplot/src/table/Table.cpp 2013-06-08 02:08:30.026204044 -0400 -@@ -564,7 +564,7 @@ - QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); - - muParserScript *mup = new muParserScript(scriptEnv, cmd, this, QString("<%1>").arg(colName(col))); -- double *r = mup->defineVariable("i"); -+ double *r = mup->defineVariable("i",startRow + 1.0); - mup->defineVariable("j", (double)col); - mup->defineVariable("sr", startRow + 1.0); - mup->defineVariable("er", endRow + 1.0); diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-sip-4.15.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-sip-4.15.patch deleted file mode 100644 index c08163019a3e..000000000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-sip-4.15.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- ./qtiplot/src/analysis/FFT.cpp.orig 2011-07-06 11:51:08.000000000 +0000 -+++ ./qtiplot/src/analysis/FFT.cpp 2013-10-23 23:07:45.674925476 +0000 -@@ -353,7 +353,7 @@ - ml->arrangeLayers(false, false); - } - --bool FFT::setDataFromTable(Table *t, const QString& realColName, const QString& imagColName, int from, int to) -+bool FFT::setDataFromTable(Table *t, const QString& realColName, const QString& imagColName, int from, int to, bool unused) - { - d_init_err = true; - ---- ./qtiplot/src/analysis/FFT.h.orig 2011-07-05 22:05:03.000000000 +0000 -+++ ./qtiplot/src/analysis/FFT.h 2013-10-23 23:11:34.277924367 +0000 -@@ -52,6 +52,8 @@ - Matrix *realOutputMatrix(){return d_re_out_matrix;} - Matrix *imaginaryOutputMatrix(){return d_im_out_matrix;} - -+ bool setDataFromTable(Table *t, const QString& realColName, const QString& imagColName = QString(), int from = 0, int to = -1, bool unused = false); -+ - private: - void init(); - void output(); -@@ -60,8 +62,6 @@ - void fftTable(); - void fftMatrix(); - -- bool setDataFromTable(Table *t, const QString& realColName, const QString& imagColName = QString(), int from = 0, int to = -1); -- - double d_sampling; - //! Flag telling if an inverse FFT must be performed. - bool d_inverse; diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-sip-4.19.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-sip-4.19.patch deleted file mode 100644 index a1ea502787c3..000000000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-sip-4.19.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/qtiplot/src/scripting/qti.sip 2017-02-13 17:01:03.123828499 +0100 -+++ b/qtiplot/src/scripting/qti.sip 2017-02-13 17:02:12.628828234 +0100 -@@ -148,14 +148,14 @@ - } - break; - case Table::Date: -- if (sipCanConvertToType(item, sipType_QDateTime, 0)) { -+ if (sipCanConvertToType(item, sipFindType("QDateTime"), 0)) { - int isErr = 0; -- QDateTime* dateTime = reinterpret_cast<QDateTime*>(sipConvertToType(item, sipType_QDateTime, -+ QDateTime* dateTime = reinterpret_cast<QDateTime*>(sipConvertToType(item, sipFindType("QDateTime"), - 0/*sipTransferObj*/, 0/*flags*/, 0/*state*/, &isErr)); - if (isErr) - return 1; - table->setText(row, col, dateTime->toString(table->columnFormat(col))); -- delete dateTime; -+ //delete dateTime; - } - else { - if (PyType_Ready(item_type) == 0) -@@ -164,14 +164,14 @@ - } - break; - case Table::Time: -- if (sipCanConvertToType(item, sipType_QTime, 0)) { -+ if (sipCanConvertToType(item, sipFindType("QTime"), 0)) { - int isErr = 0; -- QTime* time = reinterpret_cast<QTime*>(sipConvertToType(item, sipType_QTime, -+ QTime* time = reinterpret_cast<QTime*>(sipConvertToType(item, sipFindType("QTime"), - 0/*sipTransferObj*/, 0/*flags*/, 0/*state*/, &isErr)); - if (isErr) - return 1; - table->setText(row, col, time->toString(table->columnFormat(col))); -- delete time; -+ //delete time; - } - else { - if (PyType_Ready(item_type) == 0) diff --git a/sci-visualization/qtiplot/metadata.xml b/sci-visualization/qtiplot/metadata.xml deleted file mode 100644 index d4db0da9a895..000000000000 --- a/sci-visualization/qtiplot/metadata.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> - <longdescription> - Data analysis and scientific plotting package. This is a clone of the - popular Origin software available on another well known platform implemented - in Qt with powerful 2D and 3D data plotting, ASCII import and powerful - spreadsheet data manipulation using column logic. Curve fitting and other - statistical tools are also available. - </longdescription> - <use> - <flag name="linguas_cs">Czech locale</flag> - <flag name="linguas_de">German locale</flag> - <flag name="linguas_es">Spanish locale</flag> - <flag name="linguas_fr">French locale</flag> - <flag name="linguas_ja">Japanese locale</flag> - <flag name="linguas_ro">Romanian locale</flag> - <flag name="linguas_ru">Russian locale</flag> - <flag name="linguas_sv">Swedish locale</flag> - <flag name="linguas_zh_CN">Chinese locale for China</flag> - </use> -</pkgmetadata> diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild deleted file mode 100644 index 3fcaffb291d1..000000000000 --- a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild +++ /dev/null @@ -1,235 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils qt4-r2 fdo-mime python-single-r1 toolchain-funcs - -DESCRIPTION="Qt based clone of the Origin plotting package" -HOMEPAGE="http://soft.proindependent.com/qtiplot.html - http://www.staff.science.uu.nl/~zeven101/qtiplot.html" -SRC_URI=" - https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~dilfridge/distfiles/${P}-origin.patch.bz2" - -LICENSE="GPL-2 GPL-3" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="bindist doc mono latex python" - -LANGS="cn cz de es fr ja ro ru sv" -for l in ${LANGS}; do - lu=${l/cz/cs} - lu=${lu/cn/zh_CN} - IUSE="${IUSE} linguas_${lu}" -done - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# qwtplot3d much modified from original upstream -# >=x11-libs/qwt-5.3 they are using trunk checkouts -CDEPEND=" - media-libs/libemf - dev-qt/qthelp:4 - dev-qt/qtgui:4 - dev-qt/qtopengl:4 - dev-qt/qt3support:4 - dev-qt/qthelp:4[compat] - dev-qt/qtsvg:4 - >=x11-libs/gl2ps-1.3.5[png] - >=dev-cpp/muParser-1.32 - >=dev-libs/boost-1.35.0:= - dev-libs/quazip[qt4] - media-libs/libpng:= - sci-libs/alglib:= - <sci-libs/gsl-2 - sci-libs/tamu_anova - latex? ( dev-tex/qtexengine ) - mono? ( dev-dotnet/libgdiplus ) - python? ( ${PYTHON_DEPS} )" -DEPEND="${CDEPEND} - virtual/pkgconfig - python? ( >=dev-python/sip-4.9[${PYTHON_USEDEP}] ) - doc? ( - >=app-text/docbook-sgml-utils-0.6.14-r1 - >=app-text/docbook-xml-dtd-4.4-r2:4.4 )" - -RDEPEND="${CDEPEND} - python? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )" - -PATCHES=( - "${DISTDIR}"/${P}-origin.patch.bz2 - "${FILESDIR}"/${P}-origin-2.patch - "${FILESDIR}"/${P}-qt48.patch - "${FILESDIR}"/${PN}-0.9.8.8-system-gl2ps.patch - "${FILESDIR}"/${PN}-0.9.7.10-dont-install-qwt.patch - "${FILESDIR}"/${PN}-0.9.8.6-gold.patch - "${FILESDIR}"/${PN}-0.9.8.7-kde.patch - "${FILESDIR}"/${P}-set_col_values.patch - "${FILESDIR}"/${P}-adopt_to_alglib3.patch - "${FILESDIR}"/${P}-crasher_without_internet.patch - "${FILESDIR}"/${P}-private.patch - "${FILESDIR}"/${P}-sip-4.15.patch - "${FILESDIR}"/${P}-PyQt4-4.10.patch - ) - -RESTRICT="!bindist? ( bindist )" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - local mylibs - - qt4-r2_src_prepare - - rm -rf 3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/,boost,alglib} || die - sed \ - -e "s:dll:static:g" \ - -e "/INSTALLS/d" \ - -i 3rdparty/qwtplot3d/*.pro - - mylibs="${mylibs} -lquazip" - use mono && mylibs="${mylibs} $($(tc-getPKG_CONFIG) --libs libgdiplus)" - - # Check build.conf for changes on bump. - cat > build.conf <<-EOF - # Automatically generated by Gentoo ebuild - isEmpty( QTI_ROOT ) { - message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" ) - } - - MUPARSER_LIBS = $($(tc-getPKG_CONFIG) --libs muparser) - GSL_LIBS = $($(tc-getPKG_CONFIG) --libs gsl) - QWT_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwt/src - QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a - QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include - QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a - EMF_INCLUDEPATH = "${EPREFIX}/usr/include/libEMF - SYS_LIBS = -lgl2ps ${mylibs} -lGLU - - LUPDATE = lupdate - LRELEASE = lrelease - - SCRIPTING_LANGS += muParser - - CONFIG += release - CONFIG += CustomInstall - DEFINES += SCRIPTING_CONSOLE - - LIBPNG_LIBS = $($(tc-getPKG_CONFIG) --libs libpng) - TAMUANOVA_LIBS = -ltamuanova - TAMUANOVA_INCLUDEPATH = "${EPREFIX}/usr/include/tamu_anova" - ALGLIB_LIBS = -lalglib - - EOF - - use bindist && echo "DEFINES += QTIPLOT_SUPPORT" >> build.conf - use bindist || echo "DEFINES += QTIPLOT_PRO" >> build.conf - use python && echo "SCRIPTING_LANGS += Python" >> build.conf - use python && echo "PYTHON = ${EPYTHON}" >> build.conf - use latex && echo "TEX_ENGINE_LIBS = -lQTeXEngine" >> build.conf - - sed \ - -e "s:doc/${PN}/manual:doc/${PN}/html:" \ - -e '/INSTALLS.*documentation/d' \ - -e '/INSTALLS.*manual/d' \ - -e "/INSTALLBASE/s: /usr: ${EPREFIX}/usr:g" \ - -e 's:/usr/local/qtiplot:$$INSTALLBASE:g' \ - -i qtiplot/qtiplot.pro || die - - if use python; then - sed \ - -e "s:/usr/local/${PN}:${EPREFIX}$(python_get_sitedir)/qtiplot:" \ - -i qtiplot/qtiplot.pro || die - fi - - sed \ - -e "/^target.path/s:/usr:${EPREFIX}/usr:g" \ - -i fitPlugins/*/*.pro || die - - sed -e '/manual/d' -i qtiplot.pro || die - - sed -e "s:QTIPLOT_PRO:QTIPLOT_PROFESSIONAL:g" -i qtiplot/src/core/main.cpp || die - - # Drop langs only if LINGUAS is not empty - if [[ -n ${LINGUAS} ]]; then - for l in ${LANGS}; do - lu=${l/cz/cs} - lu=${lu/cn/zh_CN} - use linguas_${lu} || \ - sed -e "s:translations/qtiplot_${l}.[tq][sm]::" \ - -i qtiplot/qtiplot.pro || die - done - fi - - sed \ - -e "s:d_python_config_folder + \":\"${EPREFIX}/usr/share/qtiplot:g" \ - -i qtiplot/src/core/ApplicationWindow.cpp || die - - chmod -x qtiplot/qti_wordlist.txt - - # sed out debian paths - sed -e 's:\(/usr/share/sgml/\)docbook/stylesheet/dsssl/modular\(/html/docbook.dsl\):\1stylesheets/dsssl/docbook\2:' \ - -i manual/qtiplot.dsl || die - sed -e 's:\(/usr/share/\)xml/docbook/stylesheet/nwalsh\(/html/chunk.xsl\):\1sgml/docbook/xsl-stylesheets\2:' \ - -i manual/qtiplot_html.xsl || die - - sed \ - -e '1i#define OF(x) x' \ - -i 3rdparty/zlib/minigzip.c || die -} - -src_configure() { - use amd64 && export QMAKESPEC="linux-g++-64" - eqmake4 -} - -src_compile() { - emake - lrelease qtiplot/qtiplot.pro || die - if use doc; then - cd manual - emake web - fi -} - -src_install() { - qt4-r2_src_install - - insinto /usr/share/qtiplot - doins qtiplot/qti_wordlist.txt - - newicon qtiplot_logo.png qtiplot.png - make_desktop_entry qtiplot "QtiPlot Scientific Plotting" qtiplot - - use doc && dohtml -r manual/html/* - - use python && python_optimize - - if [[ -n ${LINGUAS} ]]; then - insinto /usr/share/${PN}/translations - for l in ${LANGS}; do - lu=${l/cz/cs} - lu=${lu/cn/zh_CN} - use linguas_${lu} && \ - doins qtiplot/translations/qtiplot_${l}.qm - done - fi -} - -pkg_postinst() { - if use python; then - optfeature "Enhanced python support" \ - dev-python/pygsl dev-python/rpy sci-libs/scipy dev-python/sympy - fi - - fdo-mime_desktop_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r3.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r3.ebuild deleted file mode 100644 index 65c127fe41f9..000000000000 --- a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r3.ebuild +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils qt4-r2 fdo-mime python-single-r1 toolchain-funcs - -DESCRIPTION="Qt based clone of the Origin plotting package" -HOMEPAGE="http://soft.proindependent.com/qtiplot.html - http://www.staff.science.uu.nl/~zeven101/qtiplot.html" -SRC_URI=" - https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~dilfridge/distfiles/${P}-origin.patch.bz2" - -LICENSE="GPL-2 GPL-3" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="bindist doc mono latex python" - -LANGS="cn cz de es fr ja ro ru sv" -for l in ${LANGS}; do - lu=${l/cz/cs} - lu=${lu/cn/zh_CN} - IUSE="${IUSE} linguas_${lu}" -done - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# qwtplot3d much modified from original upstream -# >=x11-libs/qwt-5.3 they are using trunk checkouts -CDEPEND=" - media-libs/libemf - dev-qt/qthelp:4 - dev-qt/qtgui:4 - dev-qt/qtopengl:4 - dev-qt/qt3support:4 - dev-qt/qthelp:4[compat] - dev-qt/qtsvg:4 - >=x11-libs/gl2ps-1.3.5[png] - >=dev-cpp/muParser-1.32 - >=dev-libs/boost-1.35.0:= - dev-libs/quazip[qt4] - media-libs/libpng:= - sci-libs/alglib:= - <sci-libs/gsl-2 - sci-libs/tamu_anova - latex? ( dev-tex/qtexengine ) - mono? ( dev-dotnet/libgdiplus ) - python? ( - ${PYTHON_DEPS} - >=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}] - )" -DEPEND="${CDEPEND} - virtual/pkgconfig - python? ( >=dev-python/sip-4.16.5[${PYTHON_USEDEP}] ) - doc? ( - >=app-text/docbook-sgml-utils-0.6.14-r1 - >=app-text/docbook-xml-dtd-4.4-r2:4.4 )" - -RDEPEND="${CDEPEND}" - -PATCHES=( - "${DISTDIR}"/${P}-origin.patch.bz2 - "${FILESDIR}"/${P}-origin-2.patch - "${FILESDIR}"/${P}-qt48.patch - "${FILESDIR}"/${PN}-0.9.8.8-system-gl2ps.patch - "${FILESDIR}"/${PN}-0.9.7.10-dont-install-qwt.patch - "${FILESDIR}"/${PN}-0.9.8.6-gold.patch - "${FILESDIR}"/${PN}-0.9.8.7-kde.patch - "${FILESDIR}"/${P}-set_col_values.patch - "${FILESDIR}"/${P}-adopt_to_alglib3.patch - "${FILESDIR}"/${P}-crasher_without_internet.patch - "${FILESDIR}"/${P}-private.patch - "${FILESDIR}"/${P}-sip-4.15.patch - "${FILESDIR}"/${P}-PyQt4-4.11.3.patch - "${FILESDIR}"/${P}-sip-4.19.patch -) - -RESTRICT="!bindist? ( bindist )" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - local mylibs - - qt4-r2_src_prepare - - rm -rf 3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/,boost,alglib} || die - sed \ - -e "s:dll:static:g" \ - -e "/INSTALLS/d" \ - -i 3rdparty/qwtplot3d/*.pro - - mylibs="${mylibs} -lquazip" - use mono && mylibs="${mylibs} $($(tc-getPKG_CONFIG) --libs libgdiplus)" - - # Check build.conf for changes on bump. - cat > build.conf <<-EOF - # Automatically generated by Gentoo ebuild - isEmpty( QTI_ROOT ) { - message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" ) - } - - MUPARSER_LIBS = $($(tc-getPKG_CONFIG) --libs muparser) - GSL_LIBS = $($(tc-getPKG_CONFIG) --libs gsl) - QWT_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwt/src - QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a - QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include - QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a - EMF_INCLUDEPATH = "${EPREFIX}/usr/include/libEMF - SYS_LIBS = -lgl2ps ${mylibs} -lGLU - - LUPDATE = lupdate - LRELEASE = lrelease - - SCRIPTING_LANGS += muParser - - CONFIG += release - CONFIG += CustomInstall - DEFINES += SCRIPTING_CONSOLE - - LIBPNG_LIBS = $($(tc-getPKG_CONFIG) --libs libpng) - TAMUANOVA_LIBS = -ltamuanova - TAMUANOVA_INCLUDEPATH = "${EPREFIX}/usr/include/tamu_anova" - ALGLIB_LIBS = -lalglib - - EOF - - use bindist && echo "DEFINES += QTIPLOT_SUPPORT" >> build.conf - use bindist || echo "DEFINES += QTIPLOT_PRO" >> build.conf - use python && echo "SCRIPTING_LANGS += Python" >> build.conf - use python && echo "PYTHON = ${EPYTHON}" >> build.conf - use latex && echo "TEX_ENGINE_LIBS = -lQTeXEngine" >> build.conf - - sed \ - -e "s:doc/${PN}/manual:doc/${PN}/html:" \ - -e '/INSTALLS.*documentation/d' \ - -e '/INSTALLS.*manual/d' \ - -e "/INSTALLBASE/s: /usr: ${EPREFIX}/usr:g" \ - -e 's:/usr/local/qtiplot:$$INSTALLBASE:g' \ - -i qtiplot/qtiplot.pro || die - - if use python; then - sed \ - -e "s:/usr/local/${PN}:${EPREFIX}$(python_get_sitedir)/qtiplot:" \ - -i qtiplot/qtiplot.pro || die - fi - - sed \ - -e "/^target.path/s:/usr:${EPREFIX}/usr:g" \ - -i fitPlugins/*/*.pro || die - - sed -e '/manual/d' -i qtiplot.pro || die - - sed -e "s:QTIPLOT_PRO:QTIPLOT_PROFESSIONAL:g" -i qtiplot/src/core/main.cpp || die - - # Drop langs only if LINGUAS is not empty - if [[ -n ${LINGUAS} ]]; then - for l in ${LANGS}; do - lu=${l/cz/cs} - lu=${lu/cn/zh_CN} - use linguas_${lu} || \ - sed -e "s:translations/qtiplot_${l}.[tq][sm]::" \ - -i qtiplot/qtiplot.pro || die - done - fi - - sed \ - -e "s:d_python_config_folder + \":\"${EPREFIX}/usr/share/qtiplot:g" \ - -i qtiplot/src/core/ApplicationWindow.cpp || die - - chmod -x qtiplot/qti_wordlist.txt - - # sed out debian paths - sed -e 's:\(/usr/share/sgml/\)docbook/stylesheet/dsssl/modular\(/html/docbook.dsl\):\1stylesheets/dsssl/docbook\2:' \ - -i manual/qtiplot.dsl || die - sed -e 's:\(/usr/share/\)xml/docbook/stylesheet/nwalsh\(/html/chunk.xsl\):\1sgml/docbook/xsl-stylesheets\2:' \ - -i manual/qtiplot_html.xsl || die - - sed \ - -e '1i#define OF(x) x' \ - -i 3rdparty/zlib/minigzip.c || die -} - -src_configure() { - use amd64 && export QMAKESPEC="linux-g++-64" - eqmake4 -} - -src_compile() { - emake - lrelease qtiplot/qtiplot.pro || die - if use doc; then - cd manual - emake web - fi -} - -src_install() { - qt4-r2_src_install - - insinto /usr/share/qtiplot - doins qtiplot/qti_wordlist.txt - - newicon qtiplot_logo.png qtiplot.png - make_desktop_entry qtiplot "QtiPlot Scientific Plotting" qtiplot - - use doc && dohtml -r manual/html/* - - use python && python_optimize - - if [[ -n ${LINGUAS} ]]; then - insinto /usr/share/${PN}/translations - for l in ${LANGS}; do - lu=${l/cz/cs} - lu=${lu/cn/zh_CN} - use linguas_${lu} && \ - doins qtiplot/translations/qtiplot_${l}.qm - done - fi -} - -pkg_postinst() { - if use python; then - optfeature "Enhanced python support" \ - dev-python/pygsl dev-python/rpy sci-libs/scipy dev-python/sympy - fi - - fdo-mime_desktop_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r4.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r4.ebuild deleted file mode 100644 index 42a68ecc39cb..000000000000 --- a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r4.ebuild +++ /dev/null @@ -1,241 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils qmake-utils python-single-r1 toolchain-funcs xdg - -DESCRIPTION="Qt based clone of the Origin plotting package" -HOMEPAGE=" - http://soft.proindependent.com/qtiplot.html - http://www.staff.science.uu.nl/~zeven101/qtiplot.html" -SRC_URI=" - https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~jlec/distfiles/${P}-origin.patch.xz" - -LICENSE="GPL-2 GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="bindist doc mono latex python" - -LANGS="cn cz de es fr ja ro ru sv" -for l in ${LANGS}; do - lu=${l/cz/cs} - lu=${lu/cn/zh_CN} - IUSE="${IUSE} linguas_${lu}" -done - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# qwtplot3d much modified from original upstream -# >=x11-libs/qwt-5.3 they are using trunk checkouts -RDEPEND=" - >=dev-cpp/muParser-1.32 - >=dev-libs/boost-1.35.0:= - dev-libs/quazip[qt4] - dev-qt/qt3support:4 - dev-qt/qtgui:4 - dev-qt/qthelp:4 - dev-qt/qthelp:4[compat] - dev-qt/qtopengl:4 - dev-qt/qtsvg:4 - media-libs/libemf - media-libs/libpng:= - sci-libs/alglib:= - >=sci-libs/gsl-2 - sci-libs/tamu_anova - >=x11-libs/gl2ps-1.3.5[png] - latex? ( dev-tex/qtexengine ) - mono? ( dev-dotnet/libgdiplus ) - python? ( - ${PYTHON_DEPS} - >=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}] - ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( - >=app-text/docbook-sgml-utils-0.6.14-r1 - >=app-text/docbook-xml-dtd-4.4-r2:4.4 - ) - python? ( >=dev-python/sip-4.16.5[${PYTHON_USEDEP}] ) -" - -PATCHES=( - "${WORKDIR}"/${P}-origin.patch - "${FILESDIR}"/${P}-origin-2.patch - "${FILESDIR}"/${P}-qt48.patch - "${FILESDIR}"/${PN}-0.9.8.8-system-gl2ps.patch - "${FILESDIR}"/${PN}-0.9.7.10-dont-install-qwt.patch - "${FILESDIR}"/${PN}-0.9.8.6-gold.patch - "${FILESDIR}"/${PN}-0.9.8.7-kde.patch - "${FILESDIR}"/${P}-set_col_values.patch - "${FILESDIR}"/${P}-adopt_to_alglib3.patch - "${FILESDIR}"/${P}-crasher_without_internet.patch - "${FILESDIR}"/${P}-private.patch - "${FILESDIR}"/${P}-sip-4.15.patch - "${FILESDIR}"/${P}-PyQt4-4.11.3.patch - "${FILESDIR}"/${P}-gsl-2.patch - "${FILESDIR}"/${P}-sip-4.19.patch -) - -RESTRICT="!bindist? ( bindist )" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - local mylibs - - xdg_src_prepare - - rm -rf \ - 3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/,boost,alglib} \ - || die - sed \ - -e "s:dll:static:g" \ - -e "/INSTALLS/d" \ - -i 3rdparty/qwtplot3d/*.pro || die - - mylibs="${mylibs} -lquazip" - use mono && mylibs="${mylibs} $($(tc-getPKG_CONFIG) --libs libgdiplus)" - - # Check build.conf for changes on bump. - cat > build.conf <<-EOF - # Automatically generated by Gentoo ebuild - isEmpty( QTI_ROOT ) { - message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" ) - } - - MUPARSER_LIBS = $($(tc-getPKG_CONFIG) --libs muparser) - GSL_LIBS = $($(tc-getPKG_CONFIG) --libs gsl) - QWT_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwt/src - QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a - QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include - QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a - EMF_INCLUDEPATH = "${EPREFIX}"/usr/include/libEMF - SYS_LIBS = -lgl2ps ${mylibs} -lGLU - - LUPDATE = lupdate - LRELEASE = lrelease - - SCRIPTING_LANGS += muParser - - CONFIG += release - CONFIG += CustomInstall - DEFINES += SCRIPTING_CONSOLE - - LIBPNG_LIBS = $($(tc-getPKG_CONFIG) --libs libpng) - TAMUANOVA_LIBS = -ltamuanova - TAMUANOVA_INCLUDEPATH = "${EPREFIX}/usr/include/tamu_anova" - ALGLIB_LIBS = -lalglib - - EOF - - use bindist && echo "DEFINES += QTIPLOT_SUPPORT" >> build.conf - use bindist || echo "DEFINES += QTIPLOT_PRO" >> build.conf - use python && echo "SCRIPTING_LANGS += Python" >> build.conf - use python && echo "PYTHON = ${EPYTHON}" >> build.conf - use latex && echo "TEX_ENGINE_LIBS = -lQTeXEngine" >> build.conf - - sed \ - -e "s:doc/${PN}/manual:doc/${PN}/html:" \ - -e '/INSTALLS.*documentation/d' \ - -e '/INSTALLS.*manual/d' \ - -e "/INSTALLBASE/s: /usr: ${EPREFIX}/usr:g" \ - -e 's:/usr/local/qtiplot:$$INSTALLBASE:g' \ - -i qtiplot/qtiplot.pro || die - - if use python; then - sed \ - -e "s:/usr/local/${PN}:${EPREFIX}$(python_get_sitedir)/qtiplot:" \ - -i qtiplot/qtiplot.pro || die - fi - - sed \ - -e "/^target.path/s:/usr:${EPREFIX}/usr:g" \ - -i fitPlugins/*/*.pro || die - - sed -e '/manual/d' -i qtiplot.pro || die - - sed -e "s:QTIPLOT_PRO:QTIPLOT_PROFESSIONAL:g" -i qtiplot/src/core/main.cpp || die - - # Drop langs only if LINGUAS is not empty - if [[ -n ${LINGUAS} ]]; then - for l in ${LANGS}; do - lu=${l/cz/cs} - lu=${lu/cn/zh_CN} - use linguas_${lu} || \ - sed -e "s:translations/qtiplot_${l}.[tq][sm]::" \ - -i qtiplot/qtiplot.pro || die - done - fi - - sed \ - -e "s:d_python_config_folder + \":\"${EPREFIX}/usr/share/qtiplot:g" \ - -i qtiplot/src/core/ApplicationWindow.cpp || die - - chmod -x qtiplot/qti_wordlist.txt - - # sed out debian paths - sed \ - -e 's:\(/usr/share/sgml/\)docbook/stylesheet/dsssl/modular\(/html/docbook.dsl\):\1stylesheets/dsssl/docbook\2:' \ - -i manual/qtiplot.dsl || die - sed \ - -e 's:\(/usr/share/\)xml/docbook/stylesheet/nwalsh\(/html/chunk.xsl\):\1sgml/docbook/xsl-stylesheets\2:' \ - -i manual/qtiplot_html.xsl || die - - sed \ - -e '1i#define OF(x) x' \ - -i 3rdparty/zlib/minigzip.c || die -} - -src_configure() { - use amd64 && export QMAKESPEC="linux-g++-64" - eqmake4 -} - -src_compile() { - default - lrelease qtiplot/qtiplot.pro || die - if use doc; then - cd manual || die - emake web - fi -} - -src_install() { - emake INSTALL_ROOT="${D}" install - - insinto /usr/share/qtiplot - doins qtiplot/qti_wordlist.txt - - newicon qtiplot_logo.png qtiplot.png - make_desktop_entry qtiplot "QtiPlot Scientific Plotting" qtiplot - - use doc && dodoc -r manual/html - - use python && python_optimize - - if [[ -n ${LINGUAS} ]]; then - insinto /usr/share/${PN}/translations - for l in ${LANGS}; do - lu=${l/cz/cs} - lu=${lu/cn/zh_CN} - use linguas_${lu} && \ - doins qtiplot/translations/qtiplot_${l}.qm - done - fi -} - -pkg_postinst() { - if use python; then - optfeature "Enhanced python support" \ - dev-python/pygsl dev-python/rpy sci-libs/scipy dev-python/sympy - fi - - xdg_pkg_postinst -} diff --git a/www-client/firefox/firefox-52.6.0.ebuild b/www-client/firefox/firefox-52.6.0.ebuild index 0d16477bdb08..4a5987883b3a 100644 --- a/www-client/firefox/firefox-52.6.0.ebuild +++ b/www-client/firefox/firefox-52.6.0.ebuild @@ -35,7 +35,7 @@ inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6 DESCRIPTION="Firefox Web Browser" HOMEPAGE="http://www.mozilla.com/firefox" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" SLOT="0" LICENSE="MPL-2.0 GPL-2 LGPL-2.1" |