added LDPATH as per discussion in #111340 + cosmetic cleanups

Package-Manager: portage-2.1

4 files changed, 128 insertions, 5 deletions

diff --git a/dev-ada/gtkada/ChangeLog b/dev-ada/gtkada/ChangeLog
index c20f7ef905f5..09b4d2cd7c32 100644
--- a/dev-ada/gtkada/ChangeLog
+++ b/dev-ada/gtkada/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ada/gtkada
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/gtkada/ChangeLog,v 1.16 2006/05/25 17:32:38 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/gtkada/ChangeLog,v 1.17 2006/06/12 19:38:43 george Exp $
+
+*gtkada-2.4.0-r2 (12 Jun 2006)
+
+  12 Jun 2006; George Shapovalov <george@gentoo.org>
+  +gtkada-2.4.0-r2.ebuild:
+  added LDPATH as per discussion in #111340
+  some cosmetic touches + removed debug einfo's
 
 *gtkada-2.4.0-r1 (25 May 2006)
 
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index afd57e1d0fda..f4562d5ea76c 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -29,14 +29,18 @@ EBUILD gtkada-2.4.0-r1.ebuild 3001 RMD160 244e574667cad45302c489b746d2e6fc646586
 MD5 3022e4fa8477c7535b73ad1a35053d14 gtkada-2.4.0-r1.ebuild 3001
 RMD160 244e574667cad45302c489b746d2e6fc6465862c gtkada-2.4.0-r1.ebuild 3001
 SHA256 774d3cb70dc20f52911f488efa5a7a04897967f00d4d20a08316af20e0373288 gtkada-2.4.0-r1.ebuild 3001
+EBUILD gtkada-2.4.0-r2.ebuild 2822 RMD160 70e4d8342540fb9a6d3bb112df1d6f2146b890e3 SHA1 babf2d7a92c0b231a23be6182b9aaee7c801cf49 SHA256 76b40f5ada1b5dc3f3255f15a647ca79c4c215cb137f2cce021787238d5665a4
+MD5 45a8f22ae7378a80ef7b64e347746ceb gtkada-2.4.0-r2.ebuild 2822
+RMD160 70e4d8342540fb9a6d3bb112df1d6f2146b890e3 gtkada-2.4.0-r2.ebuild 2822
+SHA256 76b40f5ada1b5dc3f3255f15a647ca79c4c215cb137f2cce021787238d5665a4 gtkada-2.4.0-r2.ebuild 2822
 EBUILD gtkada-2.4.0.ebuild 2489 RMD160 eb217c8210c89c407acf8a39ce5b0c8de88c147f SHA1 cbb2f057579cda593f9f44283342108a73f8fe07 SHA256 583599f2bf251889fb73099534508e5e8dfbd04e5da84c55bf50bfd81c35d18a
 MD5 0bc4d23968a22ac4a868334e8cbc278d gtkada-2.4.0.ebuild 2489
 RMD160 eb217c8210c89c407acf8a39ce5b0c8de88c147f gtkada-2.4.0.ebuild 2489
 SHA256 583599f2bf251889fb73099534508e5e8dfbd04e5da84c55bf50bfd81c35d18a gtkada-2.4.0.ebuild 2489
-MISC ChangeLog 2578 RMD160 95d8680dc264d6d99461516bdafb6d589ce2feeb SHA1 28c76e850d9d242c8719d231f8866649197f5365 SHA256 4321cf6ffe878d59e11923373471addb520126baee619bc19b115e98debf5b9f
-MD5 7ca73804f86a9b1eb8e537985a64170c ChangeLog 2578
-RMD160 95d8680dc264d6d99461516bdafb6d589ce2feeb ChangeLog 2578
-SHA256 4321cf6ffe878d59e11923373471addb520126baee619bc19b115e98debf5b9f ChangeLog 2578
+MISC ChangeLog 2783 RMD160 afa1ec4b9f9be2bb060d31c037755652e6da45cd SHA1 0908641d324cd639d1dbc9389b89ef4236caf8c2 SHA256 8d731b82da3ea6b7a83f55ad4138474ff8a016a0b3bb1460532ab63b50c02d1c
+MD5 3908d10baf101df83234bde5697f2c7b ChangeLog 2783
+RMD160 afa1ec4b9f9be2bb060d31c037755652e6da45cd ChangeLog 2783
+SHA256 8d731b82da3ea6b7a83f55ad4138474ff8a016a0b3bb1460532ab63b50c02d1c ChangeLog 2783
 MISC metadata.xml 556 RMD160 87ad2ce5aeff5d74ab9a1ed9c237d4f3194fefe2 SHA1 824fdfe3ec66d5eceadd15155d73467185b8fd68 SHA256 e9da50c22ca8ea4f4d56c81402717d177f569275ab67a765254cb34ef0527469
 MD5 406df42dba8304e0bfa98dd1a79452b7 metadata.xml 556
 RMD160 87ad2ce5aeff5d74ab9a1ed9c237d4f3194fefe2 metadata.xml 556
@@ -56,3 +60,6 @@ SHA256 f92cae57ea9203f4a82286b65df9c0e25c23093d60a9229c96cf87e8a51736c9 files/di
 MD5 1ff586c94c381d79b5018885627397fa files/digest-gtkada-2.4.0-r1 232
 RMD160 07b98891338f45df9bbf4386192395be4f836ddd files/digest-gtkada-2.4.0-r1 232
 SHA256 f92cae57ea9203f4a82286b65df9c0e25c23093d60a9229c96cf87e8a51736c9 files/digest-gtkada-2.4.0-r1 232
+MD5 1ff586c94c381d79b5018885627397fa files/digest-gtkada-2.4.0-r2 232
+RMD160 07b98891338f45df9bbf4386192395be4f836ddd files/digest-gtkada-2.4.0-r2 232
+SHA256 f92cae57ea9203f4a82286b65df9c0e25c23093d60a9229c96cf87e8a51736c9 files/digest-gtkada-2.4.0-r2 232
diff --git a/dev-ada/gtkada/files/digest-gtkada-2.4.0-r2 b/dev-ada/gtkada/files/digest-gtkada-2.4.0-r2
new file mode 100644
index 000000000000..2ead661b975f
--- /dev/null
+++ b/dev-ada/gtkada/files/digest-gtkada-2.4.0-r2
@@ -0,0 +1,3 @@
+MD5 31232d695ca40c3fb346fb34bc93ed3d GtkAda-2.4.0.tgz 3235169
+RMD160 ca632c4f4d67ac02cd2a872a9c144fdc79956623 GtkAda-2.4.0.tgz 3235169
+SHA256 1c80eaa850eb87101188ea4d5145b7a8093b99ff99466c1f9f17a737828cd43e GtkAda-2.4.0.tgz 3235169
diff --git a/dev-ada/gtkada/gtkada-2.4.0-r2.ebuild b/dev-ada/gtkada/gtkada-2.4.0-r2.ebuild
new file mode 100644
index 000000000000..7bb7b9578055
--- /dev/null
+++ b/dev-ada/gtkada/gtkada-2.4.0-r2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/gtkada/gtkada-2.4.0-r2.ebuild,v 1.1 2006/06/12 19:38:43 george Exp $
+
+inherit eutils gnat
+
+Name="GtkAda"
+DESCRIPTION="Gtk+ bindings to the Ada language"
+HOMEPAGE="https://libre2.adacore.com/GtkAda/"
+SRC_URI="https://libre2.adacore.com/${Name}/${Name}-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls opengl"
+
+DEPEND="virtual/gnat
+	>=x11-libs/gtk+-2.2.0
+	>=sys-apps/sed-4"
+RDEPEND=""
+
+S="${WORKDIR}/${Name}-${PV}"
+
+# a location to temporarily keep common stuff installed by make install
+CommonInst="${WORKDIR}/common-install"
+
+src_unpack() {
+	gnat_src_unpack
+
+	cd ${S}
+	sed -i -e "s|-I\$prefix/include|-I${AdalibSpecsDir}|" \
+		src/gtkada-config.in
+
+}
+
+lib_compile() {
+	# some profile specific fixes first
+	sed -i -e "s|-L\$prefix/include|-L${AdalibLibTop}/$1|" \
+		src/gtkada-config.in
+
+	# ATTN! Check if this is fixed when new version comes out!
+	# this one fails on 4.1 without and 3.4 with..
+	if [[ $(get_gnat_SLOT $1) > 3.4 ]] ; then
+		epatch ${FILESDIR}/${P}.patch
+	fi
+
+	local myconf
+	use opengl && myconf="--with-GL=auto" || myconf="--with-GL=no"
+
+	econf ${myconf} $(use_enable nls) || die "./configure failed"
+
+	make GNATFLAGS="${ADACFLAGS}" || die
+}
+
+lib_install() {
+	make prefix=${DL} \
+		incdir=${DL}/adainclude \
+		libdir=${DL}/adalib \
+		alidir=${DL}/adalib \
+		install || die
+
+	# move common stuff out of $DL
+	if [[ -d "${CommonInst}" ]] ; then
+		# we need only one copy, its all identical
+		mv "${DL}"/adainclude/gtkada-mdi.adb "${DL}"
+		rm -rf "${DL}"/{adainclude/*,doc,projects,share}
+		mv "${DL}"/gtkada-mdi.adb "${DL}"/adainclude/
+	else
+		mkdir "${CommonInst}"
+		mv ${DL}/{adainclude,doc,projects,share} "${CommonInst}"
+		# one .adb file has profile-specific fixes..
+		mkdir "${DL}"/adainclude
+		mv "${CommonInst}"/adainclude/gtkada-mdi.adb "${DL}"/adainclude/
+	fi
+}
+
+src_install() {
+	#set up environment
+	echo "PATH=%DL%/bin" > ${LibEnv}
+	echo "LDPATH=%DL%/adalib" >> ${LibEnv}
+	echo "ADA_OBJECTS_PATH=%DL%/adalib" >> ${LibEnv}
+	echo "ADA_INCLUDE_PATH=%DL%/adainclude:/usr/lib/ada/adainclude/${PN}" >> ${LibEnv}
+
+	gnat_src_install
+
+	#specs
+	cd "${CommonInst}"
+	dodir "${AdalibSpecsDir}/${PN}"
+	insinto "${AdalibSpecsDir}/${PN}"
+	doins "${CommonInst}"/adainclude/*
+
+	#docs
+	cd ${S}
+	dodoc ANNOUNCE AUTHORS COPYING README
+	cd "${CommonInst}"
+	cp -dPr doc/${Name}/* share/${PN}/examples/ "${D}/usr/share/doc/${PF}"
+}
+
+pkg_postinst() {
+	eselect gnat update
+	einfo "The environment has been set up to make gnat automatically find files for"
+	einfo "GtkAda. In order to immediately activate these settings please do:"
+	einfo "   env-update && source /etc/profile"
+	einfo "Otherwise the settings will become active next time you login"
+}
+