commit: bb305819a4c39bb9a0da7f248a9ebbedc3097c7a Author: Mike Auty <ikelos <AT> gentoo <DOT> org> AuthorDate: Sat Feb 27 19:30:00 2021 +0000 Commit: Mike Auty <ikelos <AT> gentoo <DOT> org> CommitDate: Sat Feb 27 19:31:11 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb305819
app-crypt/xca: Bump stable for 733000 Closes: https://bugs.gentoo.org/733000 Signed-off-by: Mike Auty <ikelos <AT> gentoo.org> ...ca-bug-733000.patch => xca-2.1.2-bug-733000.patch} | 19 +++++++++++-------- ...ca-bug-733000.patch => xca-2.3.0-bug-733000.patch} | 0 .../xca/{xca-2.3.0.ebuild => xca-2.1.2-r1.ebuild} | 15 +++++---------- app-crypt/xca/xca-2.3.0.ebuild | 2 +- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/app-crypt/xca/files/xca-bug-733000.patch b/app-crypt/xca/files/xca-2.1.2-bug-733000.patch similarity index 55% copy from app-crypt/xca/files/xca-bug-733000.patch copy to app-crypt/xca/files/xca-2.1.2-bug-733000.patch index 044575475c8..3e17a8aa9a9 100644 --- a/app-crypt/xca/files/xca-bug-733000.patch +++ b/app-crypt/xca/files/xca-2.1.2-bug-733000.patch @@ -1,10 +1,13 @@ diff --git a/doc/Makefile b/doc/Makefile -index d481c5a..dc5b49a 100644 +index 7c9a643..f88c209 100644 --- a/doc/Makefile +++ b/doc/Makefile -@@ -5,13 +5,9 @@ endif +@@ -3,15 +3,11 @@ TOPDIR=.. + BUILD=.. + endif - DELFILES=xca*.html xca.1.gz changelog.html database_schema.html +-DELFILES=xca*.html xca.1.gz changelog.html database_schema.html ++DELFILES=xca*.html 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 @@ -18,11 +21,11 @@ index d481c5a..dc5b49a 100644 rm -f xca*.html echo 'The documentation for XCA can be viewed online at: <a href="http://hohnstaedt.de/documentation";>http://hohnstaedt.de/documentation</a>.' > $@ @@ -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 + $(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/files/xca-bug-733000.patch b/app-crypt/xca/files/xca-2.3.0-bug-733000.patch similarity index 100% rename from app-crypt/xca/files/xca-bug-733000.patch rename to app-crypt/xca/files/xca-2.3.0-bug-733000.patch diff --git a/app-crypt/xca/xca-2.3.0.ebuild b/app-crypt/xca/xca-2.1.2-r1.ebuild similarity index 84% copy from app-crypt/xca/xca-2.3.0.ebuild copy to app-crypt/xca/xca-2.1.2-r1.ebuild index 556779ccf8e..28e0f2da477 100644 --- a/app-crypt/xca/xca-2.3.0.ebuild +++ b/app-crypt/xca/xca-2.1.2-r1.ebuild @@ -27,7 +27,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-1.0.0-desktop.patch" - "${FILESDIR}/${PN}-bug-73300.patch" + "${FILESDIR}/${P}-bug-733000.patch" ) src_configure() { @@ -37,35 +37,30 @@ src_configure() { 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 + # 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 "This version 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 } diff --git a/app-crypt/xca/xca-2.3.0.ebuild b/app-crypt/xca/xca-2.3.0.ebuild index 556779ccf8e..c7ef3f20b62 100644 --- a/app-crypt/xca/xca-2.3.0.ebuild +++ b/app-crypt/xca/xca-2.3.0.ebuild @@ -27,7 +27,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-1.0.0-desktop.patch" - "${FILESDIR}/${PN}-bug-73300.patch" + "${FILESDIR}/${P}-bug-733000.patch" ) src_configure() {
