Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 564186 - app-emulation/qemu-9999 fails to dodoc
Summary: app-emulation/qemu-9999 fails to dodoc
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo QEMU Project
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-10-26 14:32 UTC by Michal Privoznik
Modified: 2015-10-26 18:43 UTC (History)
0 users

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


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Michal Privoznik 2015-10-26 14:32:03 UTC
Since

commit 9b89b6a2872f1473ef82acdcb64c901982e0ef88
Author:     Markus Armbruster <armbru@redhat.com>
AuthorDate: Thu Sep 24 18:11:55 2015 +0200
Commit:     Markus Armbruster <armbru@redhat.com>
CommitDate: Mon Oct 12 18:44:53 2015 +0200

    docs: Move files from docs/qmp/ to docs/
    
    Giving QMP its own subdirectory in docs/ is hardly worthwhile when we
    have just four files, and one of them isn't even in the subdirectory.
    Move the files from docs/qmp/ to docs/, renaming docs/qmp/README to
    docs/qmp-intro.
    
    Update MAINTAINERS.  The new pattern also captures the fourth file
    docs/writing-qmp-commands.txt.
    
    Signed-off-by: Markus Armbruster <armbru@redhat.com>
    Message-Id: <1443111117-29831-2-git-send-email-armbru@redhat.com>
    Reviewed-by: Eric Blake <eblake@redhat.com>
    Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>

docs/qmp folder is no longer available. Its content has been moved to docs/. Teach our ebuild to cope with that:


# diff -u /tmp/qemu-9999.ebuild /usr/portage/app-emulation/qemu/qemu-9999.ebuild 
--- /tmp/qemu-9999.ebuild       2015-10-26 15:23:03.977889763 +0100
+++ /usr/portage/app-emulation/qemu/qemu-9999.ebuild    2015-09-29 15:31:02.000000000 +0200
@@ -567,12 +567,12 @@
        doins "${FILESDIR}/bridge.conf"
 
        # Remove the docdir placed qmp-commands.txt
-       mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/"
+       mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/qmp/"
 
        cd "${S}"
        dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
        newdoc pc-bios/README README.pc-bios
-       dodoc docs/qmp-*.txt
+       dodoc docs/qmp/*.txt
 
        if [[ -n ${softmmu_targets} ]]; then
                # Remove SeaBIOS since we're using the SeaBIOS packaged one