<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "http://bugs.gentoo.org/bugzilla.dtd">

<bugzilla version="2.22.7"
          urlbase="http://bugs.gentoo.org/"
          maintainer="bugzilla@gentoo.org"
>

    <bug>
          <bug_id>224519</bug_id>
          
          <creation_ts>2008-06-01 19:16 0000</creation_ts>
          <short_desc>dev-util/gtk-doc-1.10-r1 installs extra /usr/share/doc/ directory</short_desc>
          <delta_ts>2008-06-06 15:00:28 0000</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>Gentoo Linux</product>
          <component>Ebuilds</component>
          <version>2007.0</version>
          <rep_platform>All</rep_platform>
          <op_sys>Linux</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          
          <priority>P2</priority>
          <bug_severity>trivial</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          
          <everconfirmed>1</everconfirmed>
          <reporter>mayo@clara.co.uk</reporter>
          <assigned_to>gnome@gentoo.org</assigned_to>
          

      

      
          <long_desc isprivate="0">
            <who>mayo@clara.co.uk</who>
            <bug_when>2008-06-01 19:16:28 0000</bug_when>
            <thetext>gtk-doc-1.10-r1 installs:
/usr/share/doc/gtk-doc/fdl-appendix.xml
/usr/share/doc/gtk-doc/gtk-doc-manual.xml

as well as:
/usr/share/doc/gtk-doc-1.10-r1/


Adding G2CONF=&quot;--docdir=/usr/share/doc/${PF}&quot;
to src_compile() fixed this for me.</thetext>
          </long_desc>
          <long_desc isprivate="0">
            <who>ford_prefect@gentoo.org</who>
            <bug_when>2008-06-01 22:38:16 0000</bug_when>
            <thetext>Thanks for the investigation. However, from Makefile.in it appears the correct directory might be different:

@ENABLE_SCROLLKEEPER_TRUE@docdir = $(datadir)/gnome/help/$(docname)/$(lang)

I wonder why this isn&apos;t being automatically used, though.</thetext>
          </long_desc>
          <long_desc isprivate="0">
            <who>ford_prefect@gentoo.org</who>
            <bug_when>2008-06-02 08:07:52 0000</bug_when>
            <thetext>Created an attachment (id=155205)
fix to xmldocs.make to disambiguate docdir

I think this patch should fix the issue (requires an eautoreconf).

@team, if you think this is fine, I&apos;ll submit the patch upstream.</thetext>
          </long_desc>
          <long_desc isprivate="0">
            <who>mayo@clara.co.uk</who>
            <bug_when>2008-06-02 17:23:43 0000</bug_when>
            <thetext>Created an attachment (id=155257)
patch help/manual/C/Makefile.in

Here&apos;s another thought:
   docdir = @docdir@
comes after:
   @ENABLE_SCROLLKEEPER_TRUE@docdir = $(datadir)/gnome/help/$(docname)/$(lang)

resetting it. Just reversing the order of these two seems to work:
/usr/share/gnome/help/gtk-doc-manual/C/fdl-appendix.xml
/usr/share/gnome/help/gtk-doc-manual/C/gtk-doc-manual.xml

Although even with a gnome2_scrollkeeper_update added it doesn&apos;t show up in yelp?
</thetext>
          </long_desc>
          <long_desc isprivate="0">
            <who>remi@gentoo.org</who>
            <bug_when>2008-06-06 15:00:28 0000</bug_when>
            <thetext>I just went for the simple way out : gtk-doc-1.10-r2 no longer installs the gtk-doc-manual that could have been viewed with yelp.

1) the current build uses the very *very* old scrollkeeper makefiles and I don&apos;t want to touch them with a 10-foot pole. I don&apos;t think it&apos;s ever worked properly as far as gtk-doc is concerned.

2) upstream actually fixed the manual by using gnome-doc-utils which is a bit cleaner (and it handles a lot of the scrollkeeper details on its own) but the patch is just too big.

3) the missing manual is available here : http://library.gnome.org/devel/gtk-doc-manual/stable/

Of course, we&apos;ll add those files back when gtk-doc 1.11+ is released. I just don&apos;t want any of us to waste a lot of time on this.

Thanks</thetext>
          </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>155205</attachid>
            <date>2008-06-02 08:07 0000</date>
            <desc>fix to xmldocs.make to disambiguate docdir</desc>
            <filename>gtk-doc-1.10-help-files-dir.patch</filename>
            <type>text/plain</type>
            <data encoding="base64">ZGlmZiAtdXJOcCBndGstZG9jLTEuMTAtb3JpZy94bWxkb2NzLm1ha2UgZ3RrLWRvYy0xLjEwL3ht
bGRvY3MubWFrZQotLS0gZ3RrLWRvYy0xLjEwLW9yaWcveG1sZG9jcy5tYWtlCTIwMDgtMDYtMDIg
MTA6NTk6NTcuMDAwMDAwMDAwICswNTMwCisrKyBndGstZG9jLTEuMTAveG1sZG9jcy5tYWtlCTIw
MDgtMDYtMDIgMTE6MDA6NDkuMDAwMDAwMDAwICswNTMwCkBAIC0zNCw5ICszNCw5IEBACiAKIAog
IyAqKioqKioqKioqICBCZWdpbiBvZiBzZWN0aW9uIHNvbWUgcGFja2FnZXJzIG1heSBuZWVkIHRv
IG1vZGlmeSAgKioqKioqKioqKgotIyBUaGlzIHZhcmlhYmxlIChkb2NkaXIpIHNwZWNpZmllcyB3
aGVyZSB0aGUgZG9jdW1lbnRzIHNob3VsZCBiZSBpbnN0YWxsZWQuCisjIFRoaXMgdmFyaWFibGUg
KHhtbGRpcikgc3BlY2lmaWVzIHdoZXJlIHRoZSBkb2N1bWVudHMgc2hvdWxkIGJlIGluc3RhbGxl
ZC4KICMgVGhpcyBkZWZhdWx0IHZhbHVlIHNob3VsZCB3b3JrIGZvciBtb3N0IHBhY2thZ2VzLgot
ZG9jZGlyID0gJChkYXRhZGlyKS9nbm9tZS9oZWxwLyQoZG9jbmFtZSkvJChsYW5nKQoreG1sZGly
ID0gJChkYXRhZGlyKS9nbm9tZS9oZWxwLyQoZG9jbmFtZSkvJChsYW5nKQogCiAjICoqKioqKioq
KiogIFlvdSBzaG91bGQgbm90IGhhdmUgdG8gZWRpdCBiZWxvdyB0aGlzIGxpbmUgICoqKioqKioq
KioKIHhtbF9maWxlcyA9ICQoZW50aXRpZXMpICQoZG9jbmFtZSkueG1sCkBAIC02MywxNSArNjMs
MTUgQEAgYXBwLWRpc3QtaG9vazoKIAlmaQogCiBpbnN0YWxsLWRhdGEtbG9jYWw6IG9tZgotCSQo
bWtpbnN0YWxsZGlycykgJChERVNURElSKSQoZG9jZGlyKQorCSQobWtpbnN0YWxsZGlycykgJChE
RVNURElSKSQoeG1sZGlyKQogCWZvciBmaWxlIGluICQoeG1sX2ZpbGVzKTsgZG8gXAotCSAgY3Ag
JChzcmNkaXIpLyQkZmlsZSAkKERFU1RESVIpJChkb2NkaXIpOyBcCisJICBjcCAkKHNyY2Rpcikv
JCRmaWxlICQoREVTVERJUikkKHhtbGRpcik7IFwKIAlkb25lCiAJaWYgdGVzdCAiJChmaWdkaXIp
IjsgdGhlbiBcCi0JICAkKG1raW5zdGFsbGRpcnMpICQoREVTVERJUikkKGRvY2RpcikvJChmaWdk
aXIpOyBcCisJICAkKG1raW5zdGFsbGRpcnMpICQoREVTVERJUikkKHhtbGRpcikvJChmaWdkaXIp
OyBcCiAJICBmb3IgZmlsZSBpbiAkKHNyY2RpcikvJChmaWdkaXIpLyoucG5nOyBkbyBcCiAJICAg
IGJhc2VmaWxlPWBlY2hvICQkZmlsZSB8IHNlZCAtZSAgJ3MsXi4qLywsJ2A7IFwKLQkgICAgJChJ
TlNUQUxMX0RBVEEpICQkZmlsZSAkKERFU1RESVIpJChkb2NkaXIpLyQoZmlnZGlyKS8kJGJhc2Vm
aWxlOyBcCisJICAgICQoSU5TVEFMTF9EQVRBKSAkJGZpbGUgJChERVNURElSKSQoeG1sZGlyKS8k
KGZpZ2RpcikvJCRiYXNlZmlsZTsgXAogCSAgZG9uZSBcCiAJZmkKIApAQCAtODMsMTQgKzgzLDE0
IEBAIHVuaW5zdGFsbC1sb2NhbC1kb2M6CiAJLWlmIHRlc3QgIiQoZmlnZGlyKSI7IHRoZW4gXAog
CSAgZm9yIGZpbGUgaW4gJChzcmNkaXIpLyQoZmlnZGlyKS8qLnBuZzsgZG8gXAogCSAgICBiYXNl
ZmlsZT1gZWNobyAkJGZpbGUgfCBzZWQgLWUgICdzLF4uKi8sLCdgOyBcCi0JICAgIHJtIC1mICQo
REVTVERJUikkKGRvY2RpcikvJChmaWdkaXIpLyQkYmFzZWZpbGU7IFwKKwkgICAgcm0gLWYgJChE
RVNURElSKSQoeG1sZGlyKS8kKGZpZ2RpcikvJCRiYXNlZmlsZTsgXAogCSAgZG9uZTsgXAotCSAg
cm1kaXIgJChERVNURElSKSQoZG9jZGlyKS8kKGZpZ2Rpcik7IFwKKwkgIHJtZGlyICQoREVTVERJ
UikkKHhtbGRpcikvJChmaWdkaXIpOyBcCiAJZmkKIAktZm9yIGZpbGUgaW4gJCh4bWxfZmlsZXMp
OyBkbyBcCi0JICBybSAtZiAkKERFU1RESVIpJChkb2NkaXIpLyQkZmlsZTsgXAorCSAgcm0gLWYg
JChERVNURElSKSQoeG1sZGlyKS8kJGZpbGU7IFwKIAlkb25lCi0JLXJtZGlyICQoREVTVERJUikk
KGRvY2RpcikKKwktcm1kaXIgJChERVNURElSKSQoeG1sZGlyKQogCiBjbGVhbi1sb2NhbDogY2xl
YW4tbG9jYWwtZG9jIGNsZWFuLWxvY2FsLW9tZgogCg==
</data>        

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>155257</attachid>
            <date>2008-06-02 17:23 0000</date>
            <desc>patch help/manual/C/Makefile.in</desc>
            <filename>gtk-doc-1.10-docdir.patch</filename>
            <type>text/plain</type>
            <data encoding="base64">ZGlmZiAtdXIgaGVscC5vcmlnL21hbnVhbC9DL01ha2VmaWxlLmluIGhlbHAvbWFudWFsL0MvTWFr
ZWZpbGUuaW4KLS0tIGhlbHAub3JpZy9tYW51YWwvQy9NYWtlZmlsZS5pbgkyMDA3LTEyLTIwIDE0
OjA5OjM1LjAwMDAwMDAwMCArMDAwMAorKysgaGVscC9tYW51YWwvQy9NYWtlZmlsZS5pbgkyMDA4
LTA2LTAyIDE4OjA4OjIwLjAwMDAwMDAwMCArMDEwMApAQCAtMjA1LDggKzIwNSw4IEBACiAjICoq
KioqKioqKiogIEJlZ2luIG9mIHNlY3Rpb24gc29tZSBwYWNrYWdlcnMgbWF5IG5lZWQgdG8gbW9k
aWZ5ICAqKioqKioqKioqCiAjIFRoaXMgdmFyaWFibGUgKGRvY2Rpcikgc3BlY2lmaWVzIHdoZXJl
IHRoZSBkb2N1bWVudHMgc2hvdWxkIGJlIGluc3RhbGxlZC4KICMgVGhpcyBkZWZhdWx0IHZhbHVl
IHNob3VsZCB3b3JrIGZvciBtb3N0IHBhY2thZ2VzLgotQEVOQUJMRV9TQ1JPTExLRUVQRVJfVFJV
RUBkb2NkaXIgPSAkKGRhdGFkaXIpL2dub21lL2hlbHAvJChkb2NuYW1lKS8kKGxhbmcpCiBkb2Nk
aXIgPSBAZG9jZGlyQAorQEVOQUJMRV9TQ1JPTExLRUVQRVJfVFJVRUBkb2NkaXIgPSAkKGRhdGFk
aXIpL2dub21lL2hlbHAvJChkb2NuYW1lKS8kKGxhbmcpCiBkdmlkaXIgPSBAZHZpZGlyQAogZXhl
Y19wcmVmaXggPSBAZXhlY19wcmVmaXhACiBnbGliX3ByZWZpeCA9IEBnbGliX3ByZWZpeEAK
</data>        

          </attachment>
    </bug>

</bugzilla>