backported collision fix, adjusted DEPEND to have all necessary docs generatiors

Package-Manager: portage-2.1.4.1

3 files changed, 17 insertions, 8 deletions

diff --git a/dev-ada/asis-gcc/ChangeLog b/dev-ada/asis-gcc/ChangeLog
index f74af04eabce..7399c2eb2711 100644
--- a/dev-ada/asis-gcc/ChangeLog
+++ b/dev-ada/asis-gcc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ada/asis-gcc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/ChangeLog,v 1.8 2008/02/08 14:33:08 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/ChangeLog,v 1.9 2008/02/09 00:29:18 george Exp $
+
+  09 Feb 2008; George Shapovalov <george@gentoo.org> asis-gcc-3.4.6.ebuild:
+  backported collision fix, adjusted DEPEND to have all necessary docs
+  generatiors
 
 *asis-gcc-4.2.2 (08 Feb 2008)
 
diff --git a/dev-ada/asis-gcc/Manifest b/dev-ada/asis-gcc/Manifest
index 37f6d3733ae5..01c9c9269618 100644
--- a/dev-ada/asis-gcc/Manifest
+++ b/dev-ada/asis-gcc/Manifest
@@ -2,10 +2,10 @@ DIST asis-3.4.4.tar.bz2 2874938 RMD160 ec6acf720c4fb6a386fa6da8de40f88b5b9f310d
 DIST asis-gcc-4.1.1.tar.bz2 2938979 RMD160 08112f7c283543f1350d894ca363da1e7c1d1c7f SHA1 b3ec85d7da9be03d788def2a9c7060e350e06429 SHA256 712674ad21d21c9aec59e3f4db35cb92b01a6fbc1fc80450f801666f0ac2827e
 DIST asis-gcc-4.1.2.tar.bz2 2617806 RMD160 851e91181d396c60899858d922edea2ed6f170a6 SHA1 ce2043f9b246da196bc4d2af27f1e9860dee1bcd SHA256 37466312b6c43ada02b704893b509af449ab1833bc6e3cddea40344cb8972c5e
 DIST asis-gcc-4.2.2.tar.bz2 2474021 RMD160 93d91edf9f974a85857a07f6148ce48ba75c53e2 SHA1 37453442bd803602fce15048f893ce397f30bac8 SHA256 b38528b6250d56123d32d8967f5165dddcc7e67953649c77606f1e9f56b47eba
-EBUILD asis-gcc-3.4.6.ebuild 4439 RMD160 c710027ebe17a84314f40c021e3b08c92bc05d4a SHA1 6878685cbec9eec20376d3c36f859326b1238dd8 SHA256 f4bab3b026974dbedf05e6455bf8b1837706f5fbbef2232bed176acae9007f7c
+EBUILD asis-gcc-3.4.6.ebuild 4642 RMD160 d591cdefbc764dba88fe4c66cbdefd2d24d18566 SHA1 44ed1c121594bc02c8fd489cc1cf51c7ae4aa4fd SHA256 e0573a17943656d6b1a0bb20845a43756ed4f3dd8b6f7dd01b8da5b7eab69f4c
 EBUILD asis-gcc-4.1.1.ebuild 4939 RMD160 d1c0362951eed2ce8f5f8fe25274efd4b0dee8fd SHA1 c86be95b745901a5e6b812c73c1743f1a2ee5973 SHA256 10f10a9c58f7cc07d290f9f3bd9526130174cf6965f9c9c3224c45117b5e13c7
 EBUILD asis-gcc-4.1.2-r1.ebuild 4637 RMD160 880779b9e7598d757893b8c975e00f41ec09c225 SHA1 38e70b518767a7d87c395375554ada89a9a05677 SHA256 802e3b2e72a2b5817d0e2f8d197198ed442c240601458bc946dbfe35d317ba39
 EBUILD asis-gcc-4.1.2.ebuild 4717 RMD160 49db19085bbef61b2e03c438f158cb6b8c9b1f18 SHA1 54aad1843d0fe971f1cb8e3aac8d9f57eb9982bb SHA256 a1230b54ca4bc010a8658434b9cd7cc08ddc5b1ef58c1448b6812f77ec5b58f2
 EBUILD asis-gcc-4.2.2.ebuild 4798 RMD160 78422063bfe68389437d11f7430b786918954f70 SHA1 3b7f1a0ffaf77059699c02ddd6b29ac237b17f8e SHA256 b930baedbc7742ea424fb57b8a25f600e3104c897cfb9c10aaa415109c324acf
-MISC ChangeLog 1400 RMD160 40d68dab9a482cd38c64a107b9ead3067c0c5db0 SHA1 9a746cace3739e7f4b14577b597678aefc8d7cc2 SHA256 8afb97a2021e0a6d323755e7c97827ba9f194f937b40e3ad9748600b5922aa3d
+MISC ChangeLog 1562 RMD160 ec8e85a485c270266e69802efde6485b27f52216 SHA1 5e89404eca69e2790c7891b55395dd8dce7b30a1 SHA256 d8438e73a7c36296820416937ef8f377332f0f105a9abebf5d2e6a09ab58592e
 MISC metadata.xml 697 RMD160 bb7db4aaaa1ac14f321b0f2d9958835b29d03cde SHA1 2a40deb3b8729e82013db46498802e6c49708c6f SHA256 d32f466670f99fd6e28bb2c1e1257adac3f78db0d8d325f9507a81f9b9a5f975
diff --git a/dev-ada/asis-gcc/asis-gcc-3.4.6.ebuild b/dev-ada/asis-gcc/asis-gcc-3.4.6.ebuild
index f6820e8b05a9..a5c038c2e485 100644
--- a/dev-ada/asis-gcc/asis-gcc-3.4.6.ebuild
+++ b/dev-ada/asis-gcc/asis-gcc-3.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-3.4.6.ebuild,v 1.7 2008/01/24 21:24:23 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-3.4.6.ebuild,v 1.8 2008/02/09 00:29:18 george Exp $
 
 inherit eutils flag-o-matic gnatbuild
 
@@ -20,14 +20,15 @@ IUSE="doc"
 RDEPEND="=dev-lang/gnat-gcc-${PV}*"
 DEPEND="${RDEPEND}
 	doc? ( virtual/tetex
-	app-text/texi2html )"
+	app-text/texi2html
+	app-text/ghostscript-gpl )"
 
 S="${WORKDIR}/${My_PN}-${My_PV}"
 
 # Execstack is not nearly as dangerous in Ada as in C and would require a lot of
 # work to work around. See bug #141315.
-QA_EXECSTACK="usr/lib/gnat-gcc/*/${SLOT}/adalib/libasis-${SLOT}.so
-	usr/lib/gnat-gcc/*/${SLOT}/adalib/libasis.a
+QA_EXECSTACK="usr/$(get_libdir)/gnat-gcc/*/${SLOT}/adalib/libasis-${SLOT}.so
+	usr/$(get_libdir)/gnat-gcc/*/${SLOT}/adalib/libasis.a
 	usr/*/gnat-gcc-bin/${SLOT}/*"
 
 # it may be even better to force plain -O2 -pipe -ftracer here
@@ -120,6 +121,8 @@ src_install () {
 	insinto ${My_LIBPATH}/adainclude
 	doins gnat/*.ad[sb]
 	doins asis/*.ad[sb]
+	# two files are already part of gnat, removing to avoid collision
+	rm "${D}${My_LIBPATH}"/adainclude/g-string.ad?
 
 	# tools
 	mkdir -p "${D}${My_BINPATH}"
@@ -132,13 +135,15 @@ src_install () {
 		# docs and examples
 		dodoc documentation/*.{txt,ps}
 		dohtml documentation/*.html
+		insinto /usr/share/doc/${PF}
+		doins -r documentation/*.pdf
 		# info's should go into gnat-gpl dirs
 		insinto ${My_DATAPATH}/info/
 		doins documentation/*.info
 	fi
 
 	insinto /usr/share/doc/${PF}
-	doins -r documentation/*.pdf examples/ tutorial/ templates/
+	doins -r examples/ tutorial/ templates/
 }
 
 pkg_postinst() {