[gentoo-commits] repo/gentoo:master commit in: app-crypt/xca/files/, app-crypt/xca/
commit: c1b47ad8819f31fd28cb36df2d908ee546e4ea80 Author: Hans de Graaff gentoo org> AuthorDate: Wed Aug 11 05:44:13 2021 + Commit: Hans de Graaff gentoo org> CommitDate: Wed Aug 11 05:44:24 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1b47ad8 app-crypt/xca: add 2.4.0 Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Hans de Graaff gentoo.org> app-crypt/xca/Manifest | 1 + app-crypt/xca/files/xca-2.4.0-bug-733000.patch | 29 +++ app-crypt/xca/xca-2.4.0.ebuild | 70 ++ 3 files changed, 100 insertions(+) diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest index d08bc8bc9be..cb4d7db3c7a 100644 --- a/app-crypt/xca/Manifest +++ b/app-crypt/xca/Manifest @@ -1,2 +1,3 @@ DIST xca-2.1.2.tar.gz 1086563 BLAKE2B d48727fffad16d840633af6e0ee38a279978a5b865eb6f391a3d852a0105817254ea0a4780875f2956e1f7e9931e6930c6ffbe82b117dbf8ad0058ec9d6f5c88 SHA512 1f104a22b83b802576b4820b7139971da50f9b3dd70aca8e1199e996bad4379b8681bb31b197b84a3dfa49cef4ae093f6622d15fac9667547ff47af43c1e5f07 DIST xca-2.3.0.tar.gz 1354154 BLAKE2B 31a4ac96819e8d2f7e5f623cc343f0cbff18c931ed0699dbe093dcb963c3431a3943c4dcd8f3d727896104c05a565d062b9678169bf2a8d3f7cf7748c311b53b SHA512 35522aa308e1022a739f3255f13fcf63f481000f9b7411027a009a185e33ddceeb5cf9b55406a4899d2393c7e5ace10354ff24b3b2b0c3045d110f679756b0b8 +DIST xca-2.4.0.tar.gz 1778572 BLAKE2B 2e90ef264dc53019cc37700b37d5eb0c48904ca371ae1ce0cfe2ad61be8765951ea918d356c1f2764e73d846693a66c903cba1381df5d1a588aae8bb45f8c195 SHA512 e93e2cf9dc48ed43ee9b51e977f825d81ff08835eb4d77fcbe8f9dc8ce31c77c1da879b48c25ab535717542d1fe84faa6e46c410c116edbee02072040c59667c diff --git a/app-crypt/xca/files/xca-2.4.0-bug-733000.patch b/app-crypt/xca/files/xca-2.4.0-bug-733000.patch new file mode 100644 index 000..0863c906957 --- /dev/null +++ b/app-crypt/xca/files/xca-2.4.0-bug-733000.patch @@ -0,0 +1,29 @@ +--- a/doc/Makefile 2021-05-07 22:40:29.0 +0200 b/doc/Makefile 2021-08-11 07:29:33.794844656 +0200 +@@ -12,16 +12,12 @@ + + SPHINX_FILES=$(patsubst %,sphinx/%.rst,$(RST_FILES)) + +-.build-stamp doc: xca.1.gz html/index.html qthelp/xca.qhc ++.build-stamp doc: xca.1 html/index.html qthelp/xca.qhc + qthelpfiles=qthelp/*.html qthelp/xca.qhc qthelp/xca.qch + .install-stamp: doc + + include $(TOPDIR)/Rules.mak + +-%.1.gz: %.1 +- @$(PRINT) " MAN[$(BASENAME)] $@" +- gzip -9 <$^ >$@ +- + xca.1: xca.1.head xca.1.options xca.1.tail + cat $^ > $@ + +@@ -43,7 +39,7 @@ + $(ENABLE_DOC)install -m 755 -d $(DESTDIR)$(htmldir) + $(ENABLE_DOC)install -m 644 $(qthelpfiles) $(DESTDIR)$(htmldir) + install -m 755 -d $(DESTDIR)$(mandir)/man1 +- install -m 644 *.1.gz $(DESTDIR)/$(mandir)/man1 ++ install -m 644 *.1 $(DESTDIR)/$(mandir)/man1 + + app: $(doc) + mkdir -p $(APPDIR)/Resources diff --git a/app-crypt/xca/xca-2.4.0.ebuild b/app-crypt/xca/xca-2.4.0.ebuild new file mode 100644 index 000..5ff936d0ae0 --- /dev/null +++ b/app-crypt/xca/xca-2.4.0.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit xdg-utils + +DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc" +HOMEPAGE="https://hohnstaedt.de/xca/; +SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}.tar.gz; + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="bindist doc" + +RDEPEND=" + dev-libs/libltdl:0= + dev-qt/qtgui:5 + dev-qt/qtsql:5[sqlite] + dev-qt/qtwidgets:5 + dev-libs/openssl:0=[bindist(-)=] + doc? ( app-text/linuxdoc-tools )" +DEPEND="${RDEPEND} + dev-qt/linguist-tools:5" + +PATCHES=( + "${FILESDIR}/${PN}-1.0.0-desktop.patch" + "${FILESDIR}/${P}-bug-733000.patch" +) + +src_configure() { + econf \ + --with-qt-version=5 \ + $(use_enable doc) \ + STRIP=true +} + +src_prepare() { + sed '/^CFLAGS/s@-O2 -ggdb@@' -i Local.mak.in || die + default +} + +src_compile() { + # enforce all to avoid the automatic silent rules + emake all +} + +src_install() { + default + + insinto /etc/xca + doins misc/*.txt + + ewarn "Make a backup copy of your database!" + ewarn "Version 2 completely changes the database format to SQL(ite)" + ewarn "Don't try to open it with older versions of XCA (< 1.4.0). They will corrupt the database." +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +}
[gentoo-commits] repo/gentoo:master commit in: app-crypt/xca/files/, app-crypt/xca/
commit: cf9c9af46fbc95833c3c2a7bab002ca77f498a4d Author: Mike Auty gentoo org> AuthorDate: Sat Feb 27 19:06:22 2021 + Commit: Mike Auty gentoo org> CommitDate: Sat Feb 27 19:07:37 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf9c9af4 app-crypt/xca: Fix documentation issue Bug: https://bugs.gentoo.org/733000 Signed-off-by: Mike Auty gentoo.org> app-crypt/xca/Manifest | 1 - app-crypt/xca/files/xca-bug-733000.patch | 28 ++ app-crypt/xca/xca-2.2.1.ebuild | 65 app-crypt/xca/xca-2.3.0.ebuild | 1 + 4 files changed, 29 insertions(+), 66 deletions(-) diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest index 7771e5c89ed..d08bc8bc9be 100644 --- a/app-crypt/xca/Manifest +++ b/app-crypt/xca/Manifest @@ -1,3 +1,2 @@ DIST xca-2.1.2.tar.gz 1086563 BLAKE2B d48727fffad16d840633af6e0ee38a279978a5b865eb6f391a3d852a0105817254ea0a4780875f2956e1f7e9931e6930c6ffbe82b117dbf8ad0058ec9d6f5c88 SHA512 1f104a22b83b802576b4820b7139971da50f9b3dd70aca8e1199e996bad4379b8681bb31b197b84a3dfa49cef4ae093f6622d15fac9667547ff47af43c1e5f07 -DIST xca-2.2.1.tar.gz 1339412 BLAKE2B 5d3e33a711919d85bc3457ddd596f2272f0136d96290aeb31e6d03ea86faff00be3590862e4c96d9214542db1bd536d0d22c6c04cd5071b253bbefe3ab3f4f56 SHA512 90eaf4a859779d57a4c0201dc403d67e005bd540145b9f543e13b8d5c42199f2ea05543de24b071d19a0db8e5b1e9f3bef2aea4bfe9f71f81007a5f5bb3ba406 DIST xca-2.3.0.tar.gz 1354154 BLAKE2B 31a4ac96819e8d2f7e5f623cc343f0cbff18c931ed0699dbe093dcb963c3431a3943c4dcd8f3d727896104c05a565d062b9678169bf2a8d3f7cf7748c311b53b SHA512 35522aa308e1022a739f3255f13fcf63f481000f9b7411027a009a185e33ddceeb5cf9b55406a4899d2393c7e5ace10354ff24b3b2b0c3045d110f679756b0b8 diff --git a/app-crypt/xca/files/xca-bug-733000.patch b/app-crypt/xca/files/xca-bug-733000.patch new file mode 100644 index 000..044575475c8 --- /dev/null +++ b/app-crypt/xca/files/xca-bug-733000.patch @@ -0,0 +1,28 @@ +diff --git a/doc/Makefile b/doc/Makefile +index d481c5a..dc5b49a 100644 +--- a/doc/Makefile b/doc/Makefile +@@ -5,13 +5,9 @@ endif + + DELFILES=xca*.html xca.1.gz changelog.html database_schema.html + +-doc: xca.1.gz xca.html changelog.html database_schema.html ++doc: xca.1 xca.html changelog.html database_schema.html + include $(TOPDIR)/Rules.mak + +-%.1.gz: %.1 +- @$(PRINT) " MAN[$(BASENAME)] $@" +- gzip -9 <$^ >$@ +- + xca.html: xca.sgml + rm -f xca*.html + echo 'The documentation for XCA can be viewed online at: http://hohnstaedt.de/documentation;>http://hohnstaedt.de/documentation.' > $@ +@@ -23,7 +19,7 @@ install: $(doc) + $(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 ++ install -m 644 *.1 $(DESTDIR)/$(mandir)/man1 + + app: xca.html + mkdir -p $(APPDIR)/Resources diff --git a/app-crypt/xca/xca-2.2.1.ebuild b/app-crypt/xca/xca-2.2.1.ebuild deleted file mode 100644 index 321c828980a..000 --- a/app-crypt/xca/xca-2.2.1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit xdg-utils - -DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc" -HOMEPAGE="https://hohnstaedt.de/xca/; -SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}.tar.gz; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="bindist doc libressl" - -RDEPEND=" - dev-libs/libltdl:0= - dev-qt/qtgui:5 - dev-qt/qtsql:5[sqlite] - dev-qt/qtwidgets:5 - !libressl? ( dev-libs/openssl:0=[bindist=] ) - libressl? ( >=dev-libs/libressl-2.7.0:0= ) - doc? ( app-text/linuxdoc-tools )" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5" - -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 - - ewarn "Make a backup copy of your database!" - ewarn "Version 2 completely changes the database format to SQL(ite)" - ewarn "Don't try to open it with older versions of XCA (< 1.4.0). They will corrupt the database." -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/app-crypt/xca/xca-2.3.0.ebuild
[gentoo-commits] repo/gentoo:master commit in: app-crypt/xca/files/, app-crypt/xca/
commit: 9e0b54b49a0aa3f667ea5827be41b8e88c03e062 Author: Alon Bar-Lev gentoo org> AuthorDate: Sat Feb 4 21:39:23 2017 + Commit: Alon Bar-Lev gentoo org> CommitDate: Sat Feb 4 21:40:24 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e0b54b4 app-crypt/xca: eapi bump Package-Manager: portage-2.3.3 app-crypt/xca/files/xca-1.0.0-desktop.patch | 4 ++-- app-crypt/xca/xca-1.3.2-r2.ebuild | 14 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app-crypt/xca/files/xca-1.0.0-desktop.patch b/app-crypt/xca/files/xca-1.0.0-desktop.patch index 0d35160..e2da3a1 100644 --- a/app-crypt/xca/files/xca-1.0.0-desktop.patch +++ b/app-crypt/xca/files/xca-1.0.0-desktop.patch @@ -1,5 +1,5 @@ misc/xca.desktop 2012-05-12 05:37:14.0 -0400 -+++ xca.desktop.new2013-01-03 19:43:35.877856711 -0500 +--- a/misc/xca.desktop 2012-05-12 05:37:14.0 -0400 b/misc/xca.desktop 2013-01-03 19:43:35.877856711 -0500 @@ -7,5 +7,5 @@ Icon=xca-32x32 Terminal=false diff --git a/app-crypt/xca/xca-1.3.2-r2.ebuild b/app-crypt/xca/xca-1.3.2-r2.ebuild index 117d698..37b4f1b 100644 --- a/app-crypt/xca/xca-1.3.2-r2.ebuild +++ b/app-crypt/xca/xca-1.3.2-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="6" inherit eutils flag-o-matic toolchain-funcs autotools @@ -25,9 +25,13 @@ RDEPEND=" qt4? ( dev-qt/qtgui:4 )" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-1.0.0-desktop.patch" + "${FILESDIR}/${P}-build.patch" +) + src_prepare() { - epatch "${FILESDIR}"/${PN}-1.0.0-desktop.patch - epatch "${FILESDIR}"/${P}-build.patch + default AT_M4DIR="m4" eautoreconf } @@ -35,7 +39,6 @@ src_configure() { # bug #595440 use qt5 && append-cxxflags -std=c++11 econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ --with-qt-version=$(use qt5 && echo 5 || echo 4) \ $(use_enable doc) \ STRIP=true @@ -49,6 +52,7 @@ src_compile() { src_install() { # non standard destdir emake install destdir="${ED}" + einstalldocs insinto /etc/xca doins misc/*.txt
[gentoo-commits] repo/gentoo:master commit in: app-crypt/xca/files/, app-crypt/xca/
commit: 476ecb2fe5af15aa3219d8f1d8157e0b0f003465 Author: Alon Bar-Lev gentoo org> AuthorDate: Sun Jun 12 03:13:09 2016 + Commit: Alon Bar-Lev gentoo org> CommitDate: Sun Jun 12 03:22:05 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=476ecb2f app-crypt/xca: cleanup Package-Manager: portage-2.2.28 app-crypt/xca/Manifest| 2 -- app-crypt/xca/files/xca-1.3.1-build.patch | 15 --- app-crypt/xca/xca-1.3.0.ebuild| 43 - app-crypt/xca/xca-1.3.1.ebuild| 45 --- app-crypt/xca/xca-1.3.2-r1.ebuild | 45 --- 5 files changed, 150 deletions(-) diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest index a692692..b52a424 100644 --- a/app-crypt/xca/Manifest +++ b/app-crypt/xca/Manifest @@ -1,4 +1,2 @@ DIST xca-1.1.0.tar.gz 854925 SHA256 997b62b523f6581f0d96a5f5ba2fa31dcdd2b3cf1ffe924f5c69a931b0dd44df SHA512 c22a594c61f63c71e8bc7c38ccdfabe05903a33bf5116630ca4c5072b725e551a128b10f624d01a464695d739fb9d77a510b3ced99fedc5d5378cb5fd563d954 WHIRLPOOL 1b58ec3dce44e0eb101265f7b1e68695ea2121c795f7d5f6a5349c812469c50f618ce34a5985991432b49a910b2c34fd3eb8e88ac735078a6e063801f1731be0 -DIST xca-1.3.0.tar.gz 883772 SHA256 ef5b6e4ed93abb02eb53925edd222bfeb5c26a3b0698af90a416d8e92869414c SHA512 af537154a26fbb8749034b8aa79d0379e5e2567ea2b4c82c8a2f77b0fec7017d01aa0974d013f0d84eb52f2dc18994b29890d9ab63939c91aa9e316f6ef93685 WHIRLPOOL 19ce637f6794b00f7fbc363263768a8b651a21d9dd564ec7ba05fc9c729240ae8edc9d323b899b3641f9bf757b325a77c11a84848606dfe5dec839678a2c0314 -DIST xca-1.3.1.tar.gz 883797 SHA256 c2dd8d79b37440126d9fe7281e8c6802b95537c50ad464f6f7799ffa81aa3d83 SHA512 186056638177a01ca2ed1ad6e6e9e142de7d9e4a057c9a6ec691a488cfa094c97b90f1cae6e083c0a92f5492c67afb285946acbab7ec59d21b791e46cf54bc79 WHIRLPOOL c61c67311d3d64d772219a2bd544a720143a6636c8136174a748cd7f8037caa702d2fab6448b717def18de0e9353758bddffbee049fd427724828014a71dcb92 DIST xca-1.3.2.tar.gz 897947 SHA256 04f11f2148c8369c1a1b4e109956ed8cc807ec266d0d936410624ba8ee4b5ce4 SHA512 f0a9c4d47f0c20632f44364cc55293a7d2152772a746a72bc4a46622da4e48ae612bafe918c098a71c29cdfca8e6c03c27cf85a862ca0f356eddf061414c89b2 WHIRLPOOL 11a19800447fe939d1684524c4c0da90dc8dde4dfce4ff8f606d384f976b0d6f067e8455e3a90facfbf99a1cc651affdffa9397a9a8191f1fc8d302944ea730a diff --git a/app-crypt/xca/files/xca-1.3.1-build.patch b/app-crypt/xca/files/xca-1.3.1-build.patch deleted file mode 100644 index f7b07b9..000 --- a/app-crypt/xca/files/xca-1.3.1-build.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/m4/xca_compile_test.m4 b/m4/xca_compile_test.m4 -index 5d2f8ca..fd10f5d 100644 a/m4/xca_compile_test.m4 -+++ b/m4/xca_compile_test.m4 -@@ -2,8 +2,8 @@ AC_DEFUN([XCA_COMPILE_TEST], [ - - # Try to compile a little application - # --CXXFLAGS="${CXXFLAGS} ${OPENSSL_CFLAGS}${QT_CFLAGS}" --LIBS="${LIBS} ${OPENSSL_LIBS}${QT_LIBS}" -+CXXFLAGS="${CXXFLAGS} ${OPENSSL_CFLAGS} ${QT_CFLAGS}" -+LIBS="${LIBS} ${OPENSSL_LIBS} ${QT_LIBS}" - - AC_TRY_RUN([ - #include diff --git a/app-crypt/xca/xca-1.3.0.ebuild b/app-crypt/xca/xca-1.3.0.ebuild deleted file mode 100644 index 8803f74..000 --- a/app-crypt/xca/xca-1.3.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils toolchain-funcs - -DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests and revokation lists" -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" - -RDEPEND=">=dev-libs/openssl-0.9.8:*[bindist=] - dev-qt/qtgui:4" -DEPEND="${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.0.0-desktop.patch -} - -src_configure() { - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - STRIP=true -} - -src_compile() { - # enforce all to avoid the automatic silent rules - emake all -} - -src_install() { - # non standard destdir - emake install destdir="${ED}" - - insinto /etc/xca - doins misc/*.txt -} diff --git a/app-crypt/xca/xca-1.3.1.ebuild b/app-crypt/xca/xca-1.3.1.ebuild deleted file mode 100644 index 1e7a29b..000 --- a/app-crypt/xca/xca-1.3.1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit autotools eutils toolchain-funcs - -DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests and revokation lists" -HOMEPAGE="http://xca.sourceforge.net; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86
[gentoo-commits] repo/gentoo:master commit in: app-crypt/xca/files/, app-crypt/xca/
commit: 6e02c4b77546d48394a95310052463b4e643faf2 Author: Alon Bar-Lev gentoo org> AuthorDate: Fri Jun 3 21:21:52 2016 + Commit: Alon Bar-Lev gentoo org> CommitDate: Fri Jun 3 22:06:48 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e02c4b7 app-crypt/xca: add doc, qt4, qt5 USE flags Bug: 574734 Bug: 584774 Package-Manager: portage-2.2.28 app-crypt/xca/files/xca-1.3.2-build.patch | 180 ++ app-crypt/xca/xca-1.3.2-r2.ebuild | 53 + 2 files changed, 233 insertions(+) diff --git a/app-crypt/xca/files/xca-1.3.2-build.patch b/app-crypt/xca/files/xca-1.3.2-build.patch new file mode 100644 index 000..9ca8a67 --- /dev/null +++ b/app-crypt/xca/files/xca-1.3.2-build.patch @@ -0,0 +1,180 @@ +From 476aa73644e6b3d353a1ed1cf3982e7114875088 Mon Sep 17 00:00:00 2001 +From: Alon Bar-Lev+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 +--- + 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 +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 +-
[gentoo-commits] repo/gentoo:master commit in: app-crypt/xca/files/, app-crypt/xca/
commit: 6e109766c3e7d89c6e69e3471cb6beb289f2fc6b Author: Alon Bar-Lev gentoo org> AuthorDate: Mon Oct 5 17:29:30 2015 + Commit: Alon Bar-Lev gentoo org> CommitDate: Mon Oct 5 17:29:30 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e109766 app-crypt/xca: version bump Bug: 562288 Package-Manager: portage-2.2.20.1 app-crypt/xca/Manifest| 1 + app-crypt/xca/files/xca-1.3.1-build.patch | 15 +++ app-crypt/xca/xca-1.3.1.ebuild| 44 +++ 3 files changed, 60 insertions(+) diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest index 855de8a..3eec8a9 100644 --- a/app-crypt/xca/Manifest +++ b/app-crypt/xca/Manifest @@ -1,2 +1,3 @@ DIST xca-1.1.0.tar.gz 854925 SHA256 997b62b523f6581f0d96a5f5ba2fa31dcdd2b3cf1ffe924f5c69a931b0dd44df SHA512 c22a594c61f63c71e8bc7c38ccdfabe05903a33bf5116630ca4c5072b725e551a128b10f624d01a464695d739fb9d77a510b3ced99fedc5d5378cb5fd563d954 WHIRLPOOL 1b58ec3dce44e0eb101265f7b1e68695ea2121c795f7d5f6a5349c812469c50f618ce34a5985991432b49a910b2c34fd3eb8e88ac735078a6e063801f1731be0 DIST xca-1.3.0.tar.gz 883772 SHA256 ef5b6e4ed93abb02eb53925edd222bfeb5c26a3b0698af90a416d8e92869414c SHA512 af537154a26fbb8749034b8aa79d0379e5e2567ea2b4c82c8a2f77b0fec7017d01aa0974d013f0d84eb52f2dc18994b29890d9ab63939c91aa9e316f6ef93685 WHIRLPOOL 19ce637f6794b00f7fbc363263768a8b651a21d9dd564ec7ba05fc9c729240ae8edc9d323b899b3641f9bf757b325a77c11a84848606dfe5dec839678a2c0314 +DIST xca-1.3.1.tar.gz 883797 SHA256 c2dd8d79b37440126d9fe7281e8c6802b95537c50ad464f6f7799ffa81aa3d83 SHA512 186056638177a01ca2ed1ad6e6e9e142de7d9e4a057c9a6ec691a488cfa094c97b90f1cae6e083c0a92f5492c67afb285946acbab7ec59d21b791e46cf54bc79 WHIRLPOOL c61c67311d3d64d772219a2bd544a720143a6636c8136174a748cd7f8037caa702d2fab6448b717def18de0e9353758bddffbee049fd427724828014a71dcb92 diff --git a/app-crypt/xca/files/xca-1.3.1-build.patch b/app-crypt/xca/files/xca-1.3.1-build.patch new file mode 100644 index 000..f7b07b9 --- /dev/null +++ b/app-crypt/xca/files/xca-1.3.1-build.patch @@ -0,0 +1,15 @@ +diff --git a/m4/xca_compile_test.m4 b/m4/xca_compile_test.m4 +index 5d2f8ca..fd10f5d 100644 +--- a/m4/xca_compile_test.m4 b/m4/xca_compile_test.m4 +@@ -2,8 +2,8 @@ AC_DEFUN([XCA_COMPILE_TEST], [ + + # Try to compile a little application + # +-CXXFLAGS="${CXXFLAGS} ${OPENSSL_CFLAGS}${QT_CFLAGS}" +-LIBS="${LIBS} ${OPENSSL_LIBS}${QT_LIBS}" ++CXXFLAGS="${CXXFLAGS} ${OPENSSL_CFLAGS} ${QT_CFLAGS}" ++LIBS="${LIBS} ${OPENSSL_LIBS} ${QT_LIBS}" + + AC_TRY_RUN([ + #include diff --git a/app-crypt/xca/xca-1.3.1.ebuild b/app-crypt/xca/xca-1.3.1.ebuild new file mode 100644 index 000..f09f3df --- /dev/null +++ b/app-crypt/xca/xca-1.3.1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils toolchain-funcs + +DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests and revokation lists" +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" + +RDEPEND=">=dev-libs/openssl-0.9.8:*[bindist=] + dev-qt/qtgui:4" +DEPEND="${RDEPEND}" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.0.0-desktop.patch + epatch "${FILESDIR}"/${P}-build.patch +} + +src_configure() { + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + STRIP=true +} + +src_compile() { + # enforce all to avoid the automatic silent rules + emake all +} + +src_install() { + # non standard destdir + emake install destdir="${ED}" + + insinto /etc/xca + doins misc/*.txt +}