* [gentoo-commits] repo/gentoo:master commit in: app-text/djvu/files/, app-text/djvu/
@ 2019-11-11 20:07 Mikle Kolyada
0 siblings, 0 replies; only message in thread
From: Mikle Kolyada @ 2019-11-11 20:07 UTC (permalink / raw
To: gentoo-commits
commit: 62d354ddcd624ebaea2373dbfb02b7e674190a02
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 11 20:01:50 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> 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 <zlogene <AT> 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 <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
-
---- a/libdjvu/GSmartPointer.h
-+++ b/libdjvu/GSmartPointer.h
-@@ -62,6 +62,8 @@
- # pragma interface
- #endif
-
-+#include <cstddef>
-+
- /** @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 <stddef.h>
-
- /* -------------------------------------------------- */
- /* LISP EXPRESSIONS */
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-11-11 20:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-11 20:07 [gentoo-commits] repo/gentoo:master commit in: app-text/djvu/files/, app-text/djvu/ Mikle Kolyada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox