commit: 6ed75224928e4bf7cf2ae461aa1f1d14df18ac24 Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> AuthorDate: Sat May 26 08:52:38 2018 +0000 Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> CommitDate: Sat May 26 09:34:11 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ed75224
app-crypt/xca: cleanup Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-crypt/xca/Manifest | 2 - app-crypt/xca/files/xca-1.3.2-build.patch | 180 ------------------------------ app-crypt/xca/xca-1.3.2-r2.ebuild | 56 ---------- app-crypt/xca/xca-1.4.0.ebuild | 46 -------- 4 files changed, 284 deletions(-) diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest index acafec0a9b2..5cbb5a8bd5d 100644 --- a/app-crypt/xca/Manifest +++ b/app-crypt/xca/Manifest @@ -1,3 +1 @@ -DIST xca-1.3.2.tar.gz 897947 BLAKE2B b12cc95c908187d78304ce93111c89bb8e0dc01ecab37e0ad1bd78f84a90ed9f44afa4ac35d22185b7018e238b476e496fca3c2b3a240bf654d2e5160e784b11 SHA512 f0a9c4d47f0c20632f44364cc55293a7d2152772a746a72bc4a46622da4e48ae612bafe918c098a71c29cdfca8e6c03c27cf85a862ca0f356eddf061414c89b2 -DIST xca-1.4.0.tar.gz 940245 BLAKE2B 1f0c9d72b647fa803c2b6b6019b0b9828f37b1d38d89838ac6102d560b1c930c0f962e9064d984540b0c8e14d7546529af978673955555283afa1f089af7ce7c SHA512 b220adc7551cf853037c4f5ef0cdd8eef1dda44d0fde634cfde35605396b988452bdbc97a60459911f663d6d6977d426f27f47a46a482d1a30331ac06862c1c9 DIST xca-1.4.1.tar.gz 959107 BLAKE2B 7437cdbaa5277998de200e9a5ad3a7d44aed9ae8af8fd926d7ed1917d49bec79562455ca2e82557149d748840f299ffd66edfc7f265be7d5bdcd6e4fe8dbaf9b SHA512 8294669c4887ba7a9060c3c2c06014b8a1807898569842ed61c066e8a864de014fba51a2ff867b579048083fdd4934cc7f97c92268de4944bf4aafea9c2e7b42 diff --git a/app-crypt/xca/files/xca-1.3.2-build.patch b/app-crypt/xca/files/xca-1.3.2-build.patch deleted file mode 100644 index 9ca8a670da3..00000000000 --- a/app-crypt/xca/files/xca-1.3.2-build.patch +++ /dev/null @@ -1,180 +0,0 @@ -From 476aa73644e6b3d353a1ed1cf3982e7114875088 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev <[email protected]> -Date: Fri, 3 Jun 2016 23:15:29 +0300 -Subject: [PATCH 1/2] build: add --with-qt-version to force specific qt linkage - -Signed-off-by: Alon Bar-Lev <[email protected]> ---- - configure.ac | 43 ++++++++++++++++++++++++++++--------------- - 1 file changed, 28 insertions(+), 15 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 32ba42b..8490a88 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -90,18 +90,28 @@ if test -n "${_QTDIR}" && test -d "${_QTDIR}"; then - DYLD_LIBRARY_PATH="${_QTDIR}/lib:${DYLD_LIBRARY_PATH}" - fi - --PKG_CHECK_MODULES(Qt5, [Qt5Core >= 5.0, Qt5Widgets >= 5.0], [ -- _QT_HOST_BINS="`pkg-config --variable=host_bins Qt5Core`" -- QT_MOC="${_QT_HOST_BINS}/moc" -- QT_UIC="${_QT_HOST_BINS}/uic" -- if test -n "$DARWIN"; then -- FRAMEDIR=`pkg-config --variable=libdir Qt5Core` -- Qt5_CFLAGS="$Qt5_CFLAGS -F${FRAMEDIR} -I${FRAMEDIR}/QtCore.framework/Headers -I${FRAMEDIR}/QtGui.framework/Headers -I${FRAMEDIR}/QtWdgets.framework/Headers" -- fi -- QT_VERSION=5 -- QT_CFLAGS="${Qt5_CFLAGS} -fPIC" -- QT_LIBS="${Qt5_LIBS}" --], [ -+AC_ARG_WITH([qt-version], -+ AS_HELP_STRING([--with-qt-version], [Select the Qt version]), -+ [WANT_QT_VERSION="$withval"], -+ [WANT_QT_VERSION=detect]) -+ -+if test "${WANT_QT_VERSION}" = detect -o "${WANT_QT_VERSION}" = 5; then -+ PKG_CHECK_MODULES(Qt5, [Qt5Core >= 5.0, Qt5Widgets >= 5.0], [ -+ _QT_HOST_BINS="`pkg-config --variable=host_bins Qt5Core`" -+ QT_MOC="${_QT_HOST_BINS}/moc" -+ QT_UIC="${_QT_HOST_BINS}/uic" -+ if test -n "$DARWIN"; then -+ FRAMEDIR=`pkg-config --variable=libdir Qt5Core` -+ Qt5_CFLAGS="$Qt5_CFLAGS -F${FRAMEDIR} -I${FRAMEDIR}/QtCore.framework/Headers -I${FRAMEDIR}/QtGui.framework/Headers -I${FRAMEDIR}/QtWdgets.framework/Headers" -+ fi -+ WANT_QT_VERSION=5 -+ QT_VERSION=5 -+ QT_CFLAGS="${Qt5_CFLAGS} -fPIC" -+ QT_LIBS="${Qt5_LIBS}" -+]) -+fi -+ -+if test "${WANT_QT_VERSION}" = detect -o "${WANT_QT_VERSION}" = 4; then - PKG_CHECK_MODULES(Qt4, [QtCore >= 4.6, QtCore < 5.0, QtGui >= 4.6, QtGui < 5.0], [ - QT_MOC="`pkg-config --variable=moc_location QtCore`" - QT_UIC="`pkg-config --variable=uic_location QtCore`" -@@ -112,18 +122,21 @@ PKG_CHECK_MODULES(Qt5, [Qt5Core >= 5.0, Qt5Widgets >= 5.0], [ - FRAMEDIR=`pkg-config --variable=libdir QtCore` - Qt4_CFLAGS="$Qt4_CFLAGS -F${FRAMEDIR} -I${FRAMEDIR}/QtCore.framework/Headers -I${FRAMEDIR}/QtGui.framework/Headers" - fi -+ WANT_QT_VERSION=4 - QT_VERSION=4 - QT_CFLAGS="${Qt4_CFLAGS}" - QT_LIBS="${Qt4_LIBS}" -- ], [ -+ ]) -+fi -+ -+if test -z "${QT_VERSION}"; then - if test -z "$DARWIN"; then - QT_LIBS=" -lQtCore -lQtGui " - else - QT_LIBS=" -framework QtGui -framework QtCore " - fi - AC_MSG_WARN([Qt pkg-config failed, using fallback defaults (${QT_LIBS})]); -- ]) --]) -+fi - - AC_SUBST([QT_CFLAGS]) - AC_SUBST([QT_LIBS]) --- -2.7.3 - -From 7112df9532f71cb3a150fef61b2d7e5d9899634c Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev <[email protected]> -Date: Fri, 3 Jun 2016 23:58:01 +0300 -Subject: [PATCH 2/2] build: add --disable-doc to disable doc installation - ---- - Local.mak.in | 1 + - configure.ac | 37 +++++++++++++++++++++++-------------- - doc/Makefile | 10 +++++----- - 3 files changed, 29 insertions(+), 19 deletions(-) - -diff --git a/Local.mak.in b/Local.mak.in -index cd5ebfc..d993b8b 100644 ---- a/Local.mak.in -+++ b/Local.mak.in -@@ -19,6 +19,7 @@ STRIP=@STRIP@ - DOCTOOL=@DOCTOOL@ - MACDEPLOYQT=@MACDEPLOYQT@ - DARWIN=@DARWIN@ -+ENABLE_DOC=@ENABLE_DOC@ - - PACKAGE_TARNAME=@PACKAGE_TARNAME@ - HOST=linux -diff --git a/configure.ac b/configure.ac -index 8490a88..03d729e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -202,20 +202,29 @@ AX_CHECK_GNU_MAKE() - - # linuxdoc application detection - ################################## --AC_CHECK_PROGS([DOCTOOL], [linuxdoc sgml2html], [":"]) --AC_SUBST([DOCTOOL]) -- --case "$DOCTOOL" in -- linuxdoc) DOCTOOL="linuxdoc -B html";; -- sgml2html) DOCTOOL="sgml2html -s 1";; -- :) -- if test "${srcdir}" != "."; then -- mkdir -p doc -- cp ${srcdir}/doc/xca-doc.tgz doc/ -- fi -- AC_MSG_WARN(['linuxdoc' or 'sgml2html' not found, using pre-compiled documentation]) -- ;; --esac -+AC_ARG_ENABLE([doc], -+ AS_HELP_STRING([--disable-doc], [Disable documentation installation]), -+ , -+ [enable_doc=yes]) -+test "${enable_doc}" = "yes" && ENABLE_DOC= || ENABLE_DOC='\#' -+AC_SUBST([ENABLE_DOC]) -+ -+if test "${enable_doc}"; then -+ AC_CHECK_PROGS([DOCTOOL], [linuxdoc sgml2html], [":"]) -+ AC_SUBST([DOCTOOL]) -+ -+ case "$DOCTOOL" in -+ linuxdoc) DOCTOOL="linuxdoc -B html";; -+ sgml2html) DOCTOOL="sgml2html -s 1";; -+ :) -+ if test "${srcdir}" != "."; then -+ mkdir -p doc -+ cp ${srcdir}/doc/xca-doc.tgz doc/ -+ fi -+ AC_MSG_WARN(['linuxdoc' or 'sgml2html' not found, using pre-compiled documentation]) -+ ;; -+ esac -+fi - - # Setup done. Write local.h and Local.mak - ############################################ -diff --git a/doc/Makefile b/doc/Makefile -index fce4acf..7bf802f 100644 ---- a/doc/Makefile -+++ b/doc/Makefile -@@ -17,13 +17,13 @@ xca.html: xca.sgml - echo 'The documentation for XCA can be viewed online at: <a href="http://xca.sourceforge.net/";>http://xca.sourceforge.net/</a>.' > $@ - test ! -f xca-doc.tgz || tar zxf xca-doc.tgz - @$(PRINT) " DOC [$(BASENAME)] $@" -- $(DOCTOOL) $< >/dev/null -+ $(ENABLE_DOC)$(DOCTOOL) $< >/dev/null - - install: $(doc) -- install -m 755 -d $(destdir)$(htmldir) \ -- $(destdir)$(mandir)/man1 -- install -m 644 xca*.html $(destdir)$(htmldir) -- install *.1.gz $(destdir)/$(mandir)/man1 -+ $(ENABLE_DOC)install -m 755 -d $(destdir)$(htmldir) -+ $(ENABLE_DOC)install -m 644 xca*.html $(destdir)$(htmldir) -+ install -m 755 -d $(destdir)$(mandir)/man1 -+ install -m 644 *.1.gz $(destdir)/$(mandir)/man1 - - app: xca.html - mkdir -p $(APPDIR)/Resources --- -2.7.3 - diff --git a/app-crypt/xca/xca-1.3.2-r2.ebuild b/app-crypt/xca/xca-1.3.2-r2.ebuild deleted file mode 100644 index c0ef3a8d4f8..00000000000 --- a/app-crypt/xca/xca-1.3.2-r2.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit flag-o-matic autotools - -DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc" -HOMEPAGE="http://xca.sourceforge.net"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="bindist doc libressl" - -RDEPEND=" - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - !libressl? ( dev-libs/openssl:0=[bindist=] ) - libressl? ( dev-libs/libressl:0= ) - doc? ( app-text/linuxdoc-tools )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-1.0.0-desktop.patch" - "${FILESDIR}/${P}-build.patch" -) - -src_prepare() { - default - AT_M4DIR="m4" eautoreconf -} - -src_configure() { - # bug #595440 - append-cxxflags -std=c++11 - econf \ - --with-qt-version=5 \ - $(use_enable doc) \ - STRIP=true -} - -src_compile() { - # enforce all to avoid the automatic silent rules - emake all -} - -src_install() { - # non standard destdir - emake install destdir="${ED}" - einstalldocs - - insinto /etc/xca - doins misc/*.txt -} diff --git a/app-crypt/xca/xca-1.4.0.ebuild b/app-crypt/xca/xca-1.4.0.ebuild deleted file mode 100644 index dfa838fead8..00000000000 --- a/app-crypt/xca/xca-1.4.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc" -HOMEPAGE="http://xca.sourceforge.net"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="bindist doc libressl" - -RDEPEND=" - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - !libressl? ( dev-libs/openssl:0=[bindist=] ) - libressl? ( dev-libs/libressl:0= ) - doc? ( app-text/linuxdoc-tools )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-1.0.0-desktop.patch" -) - -src_configure() { - econf \ - --with-qt-version=5 \ - $(use_enable doc) \ - STRIP=true -} - -src_compile() { - # enforce all to avoid the automatic silent rules - emake all -} - -src_install() { - # non standard destdir - emake install destdir="${ED}" - einstalldocs - - insinto /etc/xca - doins misc/*.txt -}
