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 1514213997D for ; Mon, 11 Nov 2019 20:07:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C41DE0919; Mon, 11 Nov 2019 20:07:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 341D0E08B1 for ; Mon, 11 Nov 2019 20:07:16 +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 5D07B34CB92 for ; Mon, 11 Nov 2019 20:07:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7A5128AE for ; Mon, 11 Nov 2019 20:07:12 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1573502828.62d354ddcd624ebaea2373dbfb02b7e674190a02.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/djvu/files/, app-text/djvu/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/djvu/Manifest app-text/djvu/djvu-3.5.25.3.ebuild app-text/djvu/djvu-3.5.27-r1.ebuild app-text/djvu/djvu-3.5.27.ebuild app-text/djvu/files/djvu-3.5.24-gcc46.patch X-VCS-Directories: app-text/djvu/ app-text/djvu/files/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 62d354ddcd624ebaea2373dbfb02b7e674190a02 X-VCS-Branch: master Date: Mon, 11 Nov 2019 20:07:12 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 29e4d78d-a4a9-48e1-90cf-a8cd41ccef03 X-Archives-Hash: d92316e4b9bebea20f489a72bf7afa4a commit: 62d354ddcd624ebaea2373dbfb02b7e674190a02 Author: Mikle Kolyada gentoo org> AuthorDate: Mon Nov 11 20:01:50 2019 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Mon Nov 11 20:07:08 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62d354dd app-text/djvu: cleanup Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> app-text/djvu/Manifest | 1 - app-text/djvu/djvu-3.5.25.3.ebuild | 72 ----------------------------- app-text/djvu/djvu-3.5.27-r1.ebuild | 2 +- app-text/djvu/djvu-3.5.27.ebuild | 63 ------------------------- app-text/djvu/files/djvu-3.5.24-gcc46.patch | 40 ---------------- 5 files changed, 1 insertion(+), 177 deletions(-) diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest index 249e4f7eb32..78edcda5cc8 100644 --- a/app-text/djvu/Manifest +++ b/app-text/djvu/Manifest @@ -1,2 +1 @@ -DIST djvulibre-3.5.25.3.tar.gz 2543949 BLAKE2B 8ae6004e74a7db0fa666a3cf15f5a3b335690984838e8d674ccd7fa7dda0728771f6fab5f61747b505646e3bb206effd0bbaf9c6035fb27993d587693ad1fa43 SHA512 0e38f56d77915ee6707dd19a36a8ca9167608c39449a5c73de9cd784d712852c07c068b79a794e25f6d3ded0f927d083413dde197c9fc8f7b68c03cffe68035b DIST djvulibre-3.5.27.tar.gz 3648522 BLAKE2B e1907b4b64c48304ceb24360cfd451e4690d38803f22231d4e136dbe754715527fa0300c623bb709fa05bba206348257137b2a755651bb51ca26259680e142d0 SHA512 62abcaa2fe7edab536477929ba38b882453dab1a06e119a3f838b38d5c61f5d8c252e4769e6534582b826e49bcfb490513179580fab9c3afa84aa92053ccebee diff --git a/app-text/djvu/djvu-3.5.25.3.ebuild b/app-text/djvu/djvu-3.5.25.3.ebuild deleted file mode 100644 index ce39ce5ee79..00000000000 --- a/app-text/djvu/djvu-3.5.25.3.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils flag-o-matic xdg-utils - -MY_P="${PN}libre-${PV#*_p}" - -DESCRIPTION="DjVu viewers, encoders and utilities" -HOMEPAGE="http://djvu.sourceforge.net/" -SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" -IUSE="debug doc jpeg tiff xml" - -RDEPEND="jpeg? ( virtual/jpeg:0 ) - tiff? ( media-libs/tiff:0= )" -DEPEND="${RDEPEND} - || ( gnome-base/librsvg media-gfx/inkscape )" - -S=${WORKDIR}/${MY_P%%.3} - -src_prepare() { - sed -i \ - -e 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' \ - configure.ac || die #263688 - rm aclocal.m4 config/{libtool.m4,ltmain.sh,install-sh,config.sub,config.guess,ltoptions.m4,ltversion.m4,lt~obsolete.m4} -# epatch "${FILESDIR}/${PN}-3.5.24-gcc46.patch" - AT_M4DIR="config" eautoreconf -} - -src_configure() { - use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY" - - # We install all desktop files by hand. - econf \ - $(use_enable xml xmltools) \ - $(use_with jpeg) \ - $(use_with tiff) \ - --disable-desktopfiles -} - -DOCS=( NEWS README ) - -src_install() { - default - prune_libtool_files - - use doc && dodoc -r doc - - # Install desktop files. - cd desktopfiles - for i in {22,32,48,64}; do - insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes - newins hi${i}-djvu.png image-vnd.djvu.png - done - insinto /usr/share/mime/packages - doins djvulibre-mime.xml -} - -pkg_postinst() { - xdg_mimeinfo_database_update - has_version app-text/djview || \ - optfeature "For djviewer or browser plugin" app-text/djview -} - -pkg_postrm() { - xdg_mimeinfo_database_update -} diff --git a/app-text/djvu/djvu-3.5.27-r1.ebuild b/app-text/djvu/djvu-3.5.27-r1.ebuild index 0701849a730..f7d701f00ed 100644 --- a/app-text/djvu/djvu-3.5.27-r1.ebuild +++ b/app-text/djvu/djvu-3.5.27-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit desktop flag-o-matic xdg-utils +inherit desktop eutils flag-o-matic xdg-utils MY_P="${PN}libre-${PV#*_p}" diff --git a/app-text/djvu/djvu-3.5.27.ebuild b/app-text/djvu/djvu-3.5.27.ebuild deleted file mode 100644 index 63ee44269e4..00000000000 --- a/app-text/djvu/djvu-3.5.27.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils flag-o-matic xdg-utils - -MY_P="${PN}libre-${PV#*_p}" - -DESCRIPTION="DjVu viewers, encoders and utilities" -HOMEPAGE="http://djvu.sourceforge.net/" -SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" -IUSE="debug doc jpeg tiff xml" - -RDEPEND="jpeg? ( virtual/jpeg:0 ) - tiff? ( media-libs/tiff:0= )" -DEPEND="${RDEPEND} - || ( gnome-base/librsvg media-gfx/inkscape )" - -S=${WORKDIR}/${MY_P%%.3} - -src_configure() { - use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY" - - # We install all desktop files by hand. - econf \ - $(use_enable xml xmltools) \ - $(use_with jpeg) \ - $(use_with tiff) \ - --disable-desktopfiles -} - -DOCS=( NEWS README ) - -src_install() { - default - prune_libtool_files - - use doc && dodoc -r doc - - # Install desktop files. - cd desktopfiles - for i in {22,32,48,64}; do - insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes - newins prebuilt-hi${i}-djvu.png image-vnd.djvu.png - done - insinto /usr/share/mime/packages - doins djvulibre-mime.xml -} - -pkg_postinst() { - xdg_mimeinfo_database_update - has_version app-text/djview || \ - optfeature "For djviewer or browser plugin" app-text/djview -} - -pkg_postrm() { - xdg_mimeinfo_database_update -} diff --git a/app-text/djvu/files/djvu-3.5.24-gcc46.patch b/app-text/djvu/files/djvu-3.5.24-gcc46.patch deleted file mode 100644 index 2d1d099bfbb..00000000000 --- a/app-text/djvu/files/djvu-3.5.24-gcc46.patch +++ /dev/null @@ -1,40 +0,0 @@ -http://bugs.gentoo.org/361057 for GSmartPointer.h change - -Then include stddef.h in the installed headers to fix building of reverse -dependencies, such as app-text/zathura-djvu - -These are all in upstream GIT - ---- a/libdjvu/ddjvuapi.h -+++ b/libdjvu/ddjvuapi.h -@@ -64,6 +64,7 @@ - } - #endif - -+#include - #include - #include - ---- a/libdjvu/GSmartPointer.h -+++ b/libdjvu/GSmartPointer.h -@@ -62,6 +62,8 @@ - # pragma interface - #endif - -+#include -+ - /** @name GSmartPointer.h - - Files #"GSmartPointer.h"# and #"GSmartPointer.cpp"# define a smart-pointer ---- a/libdjvu/miniexp.h -+++ b/libdjvu/miniexp.h -@@ -38,7 +38,8 @@ - #ifndef MINILISPAPI - # define MINILISPAPI /**/ - #endif -- -+ -+#include - - /* -------------------------------------------------- */ - /* LISP EXPRESSIONS */