fixed broken Makefile logic (#111340) - shared libs are now installed under proper names and symlinked as they should. Revbump, as this is affects the result.

Package-Manager: portage-2.1_rc1-r2

4 files changed, 127 insertions, 5 deletions

diff --git a/dev-ada/xmlada/ChangeLog b/dev-ada/xmlada/ChangeLog
index d8d3d3826f1b..1d55ecec836f 100644
--- a/dev-ada/xmlada/ChangeLog
+++ b/dev-ada/xmlada/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ada/xmlada
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/xmlada/ChangeLog,v 1.15 2006/05/15 10:11:02 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/xmlada/ChangeLog,v 1.16 2006/05/16 21:28:39 george Exp $
+
+*xmlada-1.0-r2 (16 May 2006)
+
+  16 May 2006; George Shapovalov <george@gentoo.org> +xmlada-1.0-r2.ebuild:
+  fixed broken Makefile logic (#111340) - shared libs are now installed under proper
+  names and symlinked as they should. Revbump, as this is affects the result.
 
 *xmlada-1.0-r1 (15 May 2006)
 
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index 51f63ea5b046..0cd21a153e4f 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -8,14 +8,18 @@ EBUILD xmlada-1.0-r1.ebuild 3032 RMD160 e3f8e7d640bf16a9202be72287ce13d1ba2948d3
 MD5 7730492260f8c3e35fb4645ef4b1f8fe xmlada-1.0-r1.ebuild 3032
 RMD160 e3f8e7d640bf16a9202be72287ce13d1ba2948d3 xmlada-1.0-r1.ebuild 3032
 SHA256 75dd8aa857e60ff4089b9859f86ff9810d24c7bdfd1c66b995ecc972278a7bf5 xmlada-1.0-r1.ebuild 3032
+EBUILD xmlada-1.0-r2.ebuild 3029 RMD160 bedd9d5b0eec957519edb2890e891b95ea8f6e5b SHA1 6a85ea838fd2a78a81925694622144bc8b4c12a7 SHA256 538f435490294ce923b1cc25768116e967172a1f23e43adaf9d32ff6c27c47db size 3029
+MD5 bb1834883a9b4738591e4b9082f69ed9 xmlada-1.0-r2.ebuild 3029
+RMD160 bedd9d5b0eec957519edb2890e891b95ea8f6e5b xmlada-1.0-r2.ebuild 3029
+SHA256 538f435490294ce923b1cc25768116e967172a1f23e43adaf9d32ff6c27c47db xmlada-1.0-r2.ebuild 3029
 EBUILD xmlada-1.0.ebuild 2674 RMD160 3e0ed594fdcb1e8fbfe65441e730461d94d24830 SHA1 8da938d6ca423ae746bac3dc54e9a5632c938339 SHA256 5e7466137ae63047ae21ff0909badd4cfd04a59c11c8243e5826415c7d4b8a53 size 2674
 MD5 410d5cb08015d40bd22d102c82653e7c xmlada-1.0.ebuild 2674
 RMD160 3e0ed594fdcb1e8fbfe65441e730461d94d24830 xmlada-1.0.ebuild 2674
 SHA256 5e7466137ae63047ae21ff0909badd4cfd04a59c11c8243e5826415c7d4b8a53 xmlada-1.0.ebuild 2674
-MISC ChangeLog 2366 RMD160 645bcf65635e0084828d7e4e4b57517479d50163 SHA1 a3061132d0c359df2bf6c83c5fd38da3efb666e9 SHA256 1e3961437fb8cce0c97b4563500ef2356c1ce6a39866e2f683422a6164e30757 size 2366
-MD5 0495929d019c94e42be12244aaef6c3d ChangeLog 2366
-RMD160 645bcf65635e0084828d7e4e4b57517479d50163 ChangeLog 2366
-SHA256 1e3961437fb8cce0c97b4563500ef2356c1ce6a39866e2f683422a6164e30757 ChangeLog 2366
+MISC ChangeLog 2636 RMD160 20ad4b20dfdec1aee88674945b2cf96d989607c0 SHA1 9ed6e79731680fb35f08f0380ebaf8869a4c9c24 SHA256 43a7678e90ff95b60b58f3d4c0e7b8b7194393068e6d16a2f4222ddec8775b9e size 2636
+MD5 4845e936730f935b4794473ab415bd54 ChangeLog 2636
+RMD160 20ad4b20dfdec1aee88674945b2cf96d989607c0 ChangeLog 2636
+SHA256 43a7678e90ff95b60b58f3d4c0e7b8b7194393068e6d16a2f4222ddec8775b9e ChangeLog 2636
 MISC metadata.xml 938 RMD160 d56fe21a5d0e3476dea7db8c325618f6ec007502 SHA1 47efe6a2dbcf0f11b04f1bd9d144e018ace7579d SHA256 2f009a0f62b8fc89cc7188d5bedfcd8cea774d70456f69454ad2ec6cd544a377 size 938
 MD5 e1d1b17d24932d84db6122c279bf6008 metadata.xml 938
 RMD160 d56fe21a5d0e3476dea7db8c325618f6ec007502 metadata.xml 938
@@ -29,3 +33,6 @@ SHA256 69b9a39439d61373b44cd98d5a6766587e7b8591bdbe286fd567bcc7bc45a941 files/di
 MD5 299eeb6a952f9e3305b5fdde97edb62f files/digest-xmlada-1.0-r1 223
 RMD160 fe8484ffc2ac0a6b85475820d0a5f0830ac6020a files/digest-xmlada-1.0-r1 223
 SHA256 69b9a39439d61373b44cd98d5a6766587e7b8591bdbe286fd567bcc7bc45a941 files/digest-xmlada-1.0-r1 223
+MD5 299eeb6a952f9e3305b5fdde97edb62f files/digest-xmlada-1.0-r2 223
+RMD160 fe8484ffc2ac0a6b85475820d0a5f0830ac6020a files/digest-xmlada-1.0-r2 223
+SHA256 69b9a39439d61373b44cd98d5a6766587e7b8591bdbe286fd567bcc7bc45a941 files/digest-xmlada-1.0-r2 223
diff --git a/dev-ada/xmlada/files/digest-xmlada-1.0-r2 b/dev-ada/xmlada/files/digest-xmlada-1.0-r2
new file mode 100644
index 000000000000..9fd54c6ed23c
--- /dev/null
+++ b/dev-ada/xmlada/files/digest-xmlada-1.0-r2
@@ -0,0 +1,3 @@
+MD5 1f7a2b701dfe82ff09407e6a18540b77 XmlAda-1.0.tgz 322079
+RMD160 08e23274cab3786527dccbd18c7ae891e37240ba XmlAda-1.0.tgz 322079
+SHA256 e86ccd448574ff1ec2205f9bfbfa5812023dc4ce5d4b1c2e2c8b1ffbd29ce917 XmlAda-1.0.tgz 322079
diff --git a/dev-ada/xmlada/xmlada-1.0-r2.ebuild b/dev-ada/xmlada/xmlada-1.0-r2.ebuild
new file mode 100644
index 000000000000..67d8703d879d
--- /dev/null
+++ b/dev-ada/xmlada/xmlada-1.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/xmlada/xmlada-1.0-r2.ebuild,v 1.1 2006/05/16 21:28:39 george Exp $
+
+inherit gnat versionator
+
+IUSE=""
+
+Name="XmlAda"
+
+DESCRIPTION="XML library for Ada"
+HOMEPAGE="http://libre2.adacore.com/xmlada/"
+SRC_URI="https://libre2.adacore.com/xmlada/${Name}-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND="virtual/gnat
+	>=sys-apps/sed-4"
+RDEPEND=""
+
+
+src_unpack()
+{
+	gnat_src_unpack
+
+	cd ${S}
+	#making .dvi docs is problemmatic. Skip that for now
+	sed -i -e "s/all: obj test docs/all: obj test/" Makefile.in
+	#increase stack size
+	cd sax
+	sed -i -e "s/Stack_Size : constant Natural := 64;/Stack_Size : constant Natural := 128;/" sax-readers.adb
+}
+
+lib_compile()
+{
+	# for some reason shared libs are assigned version numbers from some
+	# pre-release (possibly when upstream stopped to care about them?)
+	local MAJOR=$(get_major_version)
+	local MINOR=$(get_version_component_range 2-)
+	# force building shared libs and fix broken shared lib versioning
+	sed -i -e "s:BUILD_SHARED=FALSE:BUILD_SHARED=TRUE:" \
+		-e "s:libxmlada_\${@\:%_install=%}-\${MAJOR}.\${MINOR}.so:libxmlada_\${@\:%_inst=%}.so.${MAJOR}.${MINOR}:" \
+		-e "s:libxmlada_\${@\:%_inst=%}-\${MAJOR}.\${MINOR}.so:libxmlada_\${@\:%_inst=%}.so.${MAJOR}.${MINOR}:" \
+		-e "s:FPIC=:FPIC=-fPIC:" Makefile.in
+
+	export CFLAGS=$ADACFLAGS
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--enable-shared \
+		--host=${CHOST} \
+		--build=${CHOST} \
+		--target=${CHOST} \
+		--with-system-zlib || die
+
+	export COMPILER=gnatmake
+	make || die "make failed"
+}
+
+# here we need to use the $1 - passed gnat profile name
+lib_install() {
+	make PREFIX=${DL} install || die "install failed"
+
+	# fix xmlada-config hardsets locations
+	sed -i -e "s:\${prefix}/include/xmlada:${AdalibSpecsDir}/${PN}:" \
+		-e "s:\${prefix}/lib:${AdalibLibTop}/$1/${PN}:g" \
+		${DL}/bin/xmlada-config
+
+	# now move stuff to proper location and delete extras
+	mv ${DL}/bin/xmlada-config ${DL}/lib/* ${DL}/include/${PN}/*.ali ${DL}
+	rm -rf ${DL}/bin ${DL}/include ${DL}/lib
+}
+
+src_install ()
+{
+	cd ${S}
+	dodir ${AdalibSpecsDir}/${PN}
+	insinto ${AdalibSpecsDir}/${PN}
+	doins dom/*.ad? input_sources/*.ad? sax/*.ad? unicode/*.ad?
+
+	#set up environment
+	echo "PATH=%DL%" > ${LibEnv}
+	echo "ADA_OBJECTS_PATH=%DL%" >> ${LibEnv}
+	echo "ADA_INCLUDE_PATH=/usr/lib/ada/adainclude/${PN}" >> ${LibEnv}
+
+	gnat_src_install
+
+	dodoc AUTHORS COPYING README docs/xml.ps
+	dohtml docs/*.html
+	doinfo docs/*.info
+	#need to give a proper name to the info file
+	cd ${D}/usr/share/info
+	mv xml.info.gz ${PN}.info.gz
+
+}
+
+pkg_postinst() {
+	eselect gnat update
+	einfo "The environment has been set up to make gnat automatically find files for"
+	einfo "XmlAda. In order to immediately activate these settings please do:"
+	einfo "env-update"
+	einfo "source /etc/profile"
+	einfo "Otherwise the settings will become active next time you login"
+}