[gentoo-commits] portage r11504 - in main/branches/prefix: bin doc doc/package/ebuild/eapi

[Fabian Groffen (grobian)]

Author: grobian
Date: 2008-09-11 17:32:16 +0000 (Thu, 11 Sep 2008)
New Revision: 11504

Modified:
   main/branches/prefix/bin/prepstrip
   main/branches/prefix/doc/custom.xsl
   main/branches/prefix/doc/package/ebuild/eapi/2.docbook
Log:
   Merged from trunk -r11499:11503

 |11500  |New debugedit support for FEATURES=splitdebug, by Sven Wegener: This |
 |zmedico|will create new-style buildid symlinks for the splitted debuginfo and|
 |       |also a symlink to the binary that belongs to the debuginfo. Requires |
 |       |debugedit from rpm 5. Old versions of debugedit ignore all unkown    |
 |       |command line arguments, so this is a no-op for them. Information:    |
 |       |http://fedoraproject.org/wiki/Releases/FeatureBuildId New debugedit  |
 |       |tarball:                                                             |
 |       |http://dev.gentoo.org/~swegener/distfiles/debugedit-5.0.0.tar.bz2    |
 
 |11501  |Remove docs for the proposed unpack() gitweb snapshot extension since|
 |zmedico|it's unpopular.                                                      |
 
 |11502  |Remove docs for the proposed eapi* default phase functions since they|
 |zmedico|are unpopular.                                                       |
 
 |11503  |Adjust chunk.section.depth and generate.section.toc.level so that the|
 |zmedico|EAPI 2 draft docs appear on a single page which includes it's own    |
 |       |table of contents.                                                   |


Modified: main/branches/prefix/bin/prepstrip
===================================================================
--- main/branches/prefix/bin/prepstrip	2008-09-11 05:50:42 UTC (rev 11503)
+++ main/branches/prefix/bin/prepstrip	2008-09-11 17:32:16 UTC (rev 11504)
@@ -56,12 +56,23 @@
 	# dont save debug info twice
 	[[ ${x} == *".debug" ]] && return 0
 
+	# this will recompute the build-id, but for now that's ok
+	local buildid="$( type -P debugedit >/dev/null && debugedit -i "${x}" )"
+
 	mkdir -p $(dirname "${y}")
 	${OBJCOPY} --only-keep-debug "${x}" "${y}"
 	${OBJCOPY} --add-gnu-debuglink="${y}" "${x}"
 	[[ -g ${x} ]] && chmod go-r "${y}"
 	[[ -u ${x} ]] && chmod go-r "${y}"
 	chmod a-x,o-w "${y}"
+
+	if [[ -n ${buildid} ]] ; then
+		local buildid_dir="${D}usr/lib/debug/.build-id/${buildid:0:2}"
+		local buildid_file="${buildid_dir}/${buildid:2}"
+		mkdir -p "${buildid_dir}"
+		ln -s "../../${x:${#D}}.debug" "${buildid_file}.debug"
+		ln -s "/${x:${#D}}" "${buildid_file}"
+	fi
 }
 
 # The existance of the section .symtab tells us that a binary is stripped.

Modified: main/branches/prefix/doc/custom.xsl
===================================================================
--- main/branches/prefix/doc/custom.xsl	2008-09-11 05:50:42 UTC (rev 11503)
+++ main/branches/prefix/doc/custom.xsl	2008-09-11 17:32:16 UTC (rev 11504)
@@ -1,3 +1,5 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 <xsl:param name="toc.section.depth" select="20"/>
+<xsl:param name="chunk.section.depth" select="2"/>
+<xsl:param name="generate.section.toc.level" select="2"/>
 </xsl:stylesheet>

Modified: main/branches/prefix/doc/package/ebuild/eapi/2.docbook
===================================================================
--- main/branches/prefix/doc/package/ebuild/eapi/2.docbook	2008-09-11 05:50:42 UTC (rev 11503)
+++ main/branches/prefix/doc/package/ebuild/eapi/2.docbook	2008-09-11 17:32:16 UTC (rev 11504)
@@ -309,19 +309,7 @@
 	</table>
 	</section>
 	</section>
-	<section id='package-ebuild-eapi-2-draft-helpers-unpack'>
-	<title>unpack</title>
-	<section id='package-ebuild-eapi-2-draft-helpers-unpack-gitweb-snapshots'>
-	<title>Gitweb Snapshots</title>
-	<para>
-	To aid interoperatiblity with gitweb, files with the suffixes of ;sf=tbz2
-	and ;sf=tgz are now treated as .tar.bz2 and .tar.gz archives, respectively.
-	This allows for ebuilds to consume gitweb snapshots and still use the
-	default src_unpack implementation.
-	</para>
 	</section>
-	</section>
-	</section>
 	<section id='package-ebuild-eapi-2-draft-metadata'>
 	<title>Metadata</title>
 	<section id='package-ebuild-eapi-2-draft-metadata-dependencies'>
@@ -555,67 +543,6 @@
 				</tbody>
 				</tgroup>
 			</table>
-			<para>
-			The default phase functions for a particular EAPI are also
-			accessible as functions having names that start with 'eapi'
-			followed by the EAPI value. For example, a call to a function
-			named eapi0_src_compile is equivalent to a call to the
-			default src_compile implementation that is provided with EAPI 0.
-			</para>
-			<table><title>Default EAPI Phase Functions</title>
-				<tgroup cols='1' align='left' >
-				<colspec colname='name'/>
-				<thead>
-				<row>
-					<entry>Function Name</entry>
-				</row>
-				</thead>
-				<tbody>
-				<row>
-					<entry>eapi0_pkg_nofetch</entry>
-				</row>
-				<row>
-					<entry>eapi0_src_unpack</entry>
-				</row>
-				<row>
-					<entry>eapi0_src_compile</entry>
-				</row>
-				<row>
-					<entry>eapi0_src_test</entry>
-				</row>
-				<row>
-					<entry>eapi1_pkg_nofetch</entry>
-				</row>
-				<row>
-					<entry>eapi1_src_unpack</entry>
-				</row>
-				<row>
-					<entry>eapi1_src_compile</entry>
-				</row>
-				<row>
-					<entry>eapi1_src_test</entry>
-				</row>
-				<row>
-					<entry>eapi2_pkg_nofetch</entry>
-				</row>
-				<row>
-					<entry>eapi2_src_unpack</entry>
-				</row>
-				<row>
-					<entry>eapi2_src_prepare</entry>
-				</row>
-				<row>
-					<entry>eapi2_src_configure</entry>
-				</row>
-				<row>
-					<entry>eapi2_src_compile</entry>
-				</row>
-				<row>
-					<entry>eapi2_src_test</entry>
-				</row>
-				</tbody>
-				</tgroup>
-			</table>
 		</section>
 		<section id='package-ebuild-eapi-2-draft-phases-default-function-alias'>
 			<title>Default Phase Function Alias</title>