From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 67D7D138334 for ; Tue, 2 Oct 2018 02:14:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8C6F3E0AB6; Tue, 2 Oct 2018 02:14:38 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 49119E0AB6 for ; Tue, 2 Oct 2018 02:14:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 75955335D1B for ; Tue, 2 Oct 2018 02:14:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 40B7842A for ; Tue, 2 Oct 2018 02:14:28 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1538446414.43dbe32c9aad84c53a9303bb2148606ce5181a1f.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/, app-doc/doxygen/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-doc/doxygen/Manifest app-doc/doxygen/doxygen-1.8.13-r1.ebuild app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch X-VCS-Directories: app-doc/doxygen/ app-doc/doxygen/files/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 43dbe32c9aad84c53a9303bb2148606ce5181a1f X-VCS-Branch: master Date: Tue, 2 Oct 2018 02:14:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9bfa825e-9e8b-439b-8dcf-3546ba1665d8 X-Archives-Hash: 0911f9cbabf37e06152ef4fd5d4212df commit: 43dbe32c9aad84c53a9303bb2148606ce5181a1f Author: Matthias Maier gentoo org> AuthorDate: Tue Oct 2 02:05:56 2018 +0000 Commit: Matthias Maier gentoo org> CommitDate: Tue Oct 2 02:13:34 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43dbe32c app-doc/doxygen: drop old version 1.8.13 Package-Manager: Portage-2.3.50, Repoman-2.3.11 Signed-off-by: Matthias Maier gentoo.org> app-doc/doxygen/Manifest | 2 - app-doc/doxygen/doxygen-1.8.13-r1.ebuild | 151 --------------------- .../files/doxygen-1.8.13-NULL-dereference.patch | 24 ---- 3 files changed, 177 deletions(-) diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest index c91844ad8f9..1131255da45 100644 --- a/app-doc/doxygen/Manifest +++ b/app-doc/doxygen/Manifest @@ -1,3 +1 @@ -DIST doxygen-1.8.13.src.tar.gz 4893912 BLAKE2B 3eb7eb6e7d122f681a9af8caf8a33789d323d52a5c205a3c44a7953eec78f4b227062da3e71c09de443aa6ac5c780937218c3a8c9ddf06d3eb23200a33b7406f SHA512 85da5bd28ad9f33a8e50fa92796817d31e59c024127cb647cb967e4321dd51378feaacdf099d578b7e6020fd646a3c63e99c77420e49e3894fc18ca89ba3e0a2 DIST doxygen-1.8.14.src.tar.gz 4877980 BLAKE2B 9886e5165188548e0c8a3760a53709615385ab175795d07156584f3878996c8c5f18e439b6e45352a32ba5cd40e9b7fdb29cdf86511e1be70b18315069e33377 SHA512 5fac7e457a51b1f8e39fb65de5e0c07633e573f74e876580e7bcad5693540d6970fde1b2cb799a4df6ab9dfca951ece15b76b3010134d7658db3500183bea85c -DIST doxywizard.png 4231 BLAKE2B c71e30fee273c7410bc6b65e171a864066e088d474785f5e24b5500806af1217a6e12e93c5b81a488e2d216bfa59aeed332a092515dbbf8b640d8f7320dda50a SHA512 5e2d26e7427b86866ebe75ec2c66c0f1100d230f3f3e4d66bac424a8dd0d42f0831d936ff03318dfa1bf73cbd9fb53717636d0c91ae3eea0f4e24641479d25d5 diff --git a/app-doc/doxygen/doxygen-1.8.13-r1.ebuild b/app-doc/doxygen/doxygen-1.8.13-r1.ebuild deleted file mode 100644 index 98099291889..00000000000 --- a/app-doc/doxygen/doxygen-1.8.13-r1.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) - -inherit cmake-utils eutils flag-o-matic python-any-r1 xdg-utils -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/doxygen/doxygen.git" - SRC_URI="" -else - SRC_URI="https://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz" - 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 ~x86-solaris" -fi -SRC_URI+=" https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png" - -DESCRIPTION="Documentation system for most programming languages" -HOMEPAGE="https://www.stack.nl/~dimitri/doxygen/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU" - -RDEPEND="app-text/ghostscript-gpl - dev-lang/perl - media-libs/libpng:0= - virtual/libiconv - clang? ( sys-devel/clang:= ) - dot? ( - media-gfx/graphviz - media-libs/freetype - ) - doxysearch? ( =dev-libs/xapian-1.2* ) - latex? ( app-text/texlive[extra] ) - qt5? ( - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - sqlite? ( dev-db/sqlite:3 ) - " - -REQUIRED_USE="doc? ( latex )" - -DEPEND="sys-devel/flex - sys-devel/bison - doc? ( ${PYTHON_DEPS} ) - ${RDEPEND}" - -# src_test() defaults to make -C testing but there is no such directory (bug #504448) -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348 - "${FILESDIR}/${PN}-1.8.12-link_with_pthread.patch" - "${FILESDIR}/${PN}-1.8.13-NULL-dereference.patch" -) - -DOCS=( LANGUAGE.HOWTO README.md ) - -pkg_setup() { - use doc && python-any-r1_pkg_setup -} - -src_prepare() { - cmake-utils_src_prepare - - # Ensure we link to -liconv - if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then - local pro - for pro in */*.pro.in */*/*.pro.in; do - echo "unix:LIBS += -liconv" >> "${pro}" || die - done - fi - - # Call dot with -Teps instead of -Tps for EPS generation - bug #282150 - sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die - - # fix pdf doc - sed -i.orig -e "s:g_kowal:g kowal:" \ - doc/maintainers.txt || die - - if is-flagq "-O3" ; then - ewarn - ewarn "Compiling with -O3 is known to produce incorrectly" - ewarn "optimized code which breaks doxygen." - ewarn - elog - elog "Continuing with -O2 instead ..." - elog - replace-flags "-O3" "-O2" - fi -} - -src_configure() { - local mycmakeargs=( - -DDOC_INSTALL_DIR="share/doc/${P}" - -Duse_libclang=$(usex clang) - -Dbuild_doc=$(usex doc) - -Dbuild_search=$(usex doxysearch) - -Dbuild_wizard=$(usex qt5) - -Duse_sqlite3=$(usex sqlite) - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - export VARTEXFONTS="${T}/fonts" # bug #564944 - - if ! use dot; then - sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \ - {Doxyfile,doc/Doxyfile} \ - || die "disabling dot failed" - fi - cmake-utils_src_make -C "${BUILD_DIR}" docs - fi -} - -src_install() { - cmake-utils_src_install - - if use qt5; then - doicon "${DISTDIR}/doxywizard.png" - make_desktop_entry doxywizard "DoxyWizard ${PV}" \ - "/usr/share/pixmaps/doxywizard.png" \ - "Development" - fi -} - -pkg_postinst() { - xdg_desktop_database_update - - elog - elog "For examples and other goodies, see the source tarball. For some" - elog "example output, run doxygen on the doxygen source using the" - elog "Doxyfile provided in the top-level source dir." - elog - elog "Disabling the dot USE flag will remove the GraphViz dependency," - elog "along with Doxygen's ability to generate diagrams in the docs." - elog "See the Doxygen homepage for additional helper tools to parse" - elog "more languages." - elog -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch b/app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch deleted file mode 100644 index 8d72e8ff6e0..00000000000 --- a/app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0f02761a158a5e9ddbd5801682482af8986dbc35 Mon Sep 17 00:00:00 2001 -From: albert-github -Date: Wed, 4 Jan 2017 12:24:55 +0100 -Subject: [PATCH] Bug 776791 - [1.8.13 Regression] Segfault building the - breathe docs - -Protected against NULL pointer of variable al ---- - src/xmlgen.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp -index fe95c7a..70e198a 100644 ---- a/src/xmlgen.cpp -+++ b/src/xmlgen.cpp -@@ -620,7 +620,7 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De - if (md->isInline()) t << "yes"; else t << "no"; - t << "\""; - -- if (al->refQualifier!=RefQualifierNone) -+ if (al!=0 && al->refQualifier!=RefQualifierNone) - { - t << " refqual=\""; - if (al->refQualifier==RefQualifierLValue) t << "lvalue"; else t << "rvalue";