Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 612672 - app-crypt/gnupg ebuilds discard documentation
Summary: app-crypt/gnupg ebuilds discard documentation
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Kristian Fiskerstrand (RETIRED)
URL:
Whiteboard:
Keywords: PATCH
Depends on:
Blocks:
 
Reported: 2017-03-15 03:42 UTC by Hank Leininger
Modified: 2017-03-25 20:36 UTC (History)
2 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
Do not uninstall standard package documentation (gnupg-2.1.19-r1_documentation.patch,438 bytes, patch)
2017-03-15 03:42 UTC, Hank Leininger
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Hank Leininger 2017-03-15 03:42:41 UTC
Created attachment 467098 [details, diff]
Do not uninstall standard package documentation

The ebuilds for gnupg from 2.0.17 through current 2.1.19-r1 delete some standard documentation before attempting to install them, whether or not the 'doc' USE flag is enabled.

All the recent ebuilds do:

  ...
  DOCS=(
        ChangeLog NEWS README THANKS TODO VERSION
        doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
  )
  ...
  src_install() {
          ...
          emake DESTDIR="${ED}" -f doc/Makefile uninstall-nobase_dist_docDATA
          ...

That 'uninstall...' make target has the effect of deleting those files under doc/ in the image directory.  (After the implied dodoc in base.eclass deploys them, I guess?)

This change was first introduced about six years ago, and appears to have been carried over to every gnupg ebuild since:

https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-crypt/gnupg/gnupg-2.0.17.ebuild?hideattic=0&r1=1.7&r2=1.8

But the diffs and the referenced bug (#356501) don't seem to line up with the stated intention in the log message - the change went too far.  And/or that make target used to mean something different from what it does now.

The ebuild does have a doc USE flag, but it has no impact here - that flag controls the installation of various additional .html files.  The few files in DOCS= under the doc/ subdirectory would be reasonable to deploy w/o USE=docs, and indeed they used to be before that change.
Comment 1 Hank Leininger 2017-03-15 18:03:40 UTC
Comment on attachment 467098 [details, diff]
Do not uninstall standard package documentation

>--- /usr/portage/app-crypt/gnupg/gnupg-2.1.19-r1.ebuild	2017-03-06 15:34:06.000000000 -0700
>+++ gnupg-2.1.19-r1.ebuild	2017-03-14 21:23:38.066044430 -0600
>@@ -110,7 +110,6 @@
> 			tools/{convert-from-106,gpg-check-pattern} \
> 			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
> 			tools/make-dns-cert
>-	emake DESTDIR="${ED}" -f doc/Makefile uninstall-nobase_dist_docDATA
> 
> 	dosym gpg2 /usr/bin/gpg
> 	dosym gpgv2 /usr/bin/gpgv
Comment 2 Alon Bar-Lev (RETIRED) gentoo-dev 2017-03-25 20:36:50 UTC
Thanks!
Added to gnupg-2.1.19-r2