gentoo resync : 30.12.2017

1 files changed, 28 insertions, 5 deletions

diff --git a/dev-ada/xmlada/xmlada-2017.ebuild b/dev-ada/xmlada/xmlada-2017.ebuild
index b80b4c4237f5..04b53bcdf500 100644
--- a/dev-ada/xmlada/xmlada-2017.ebuild
+++ b/dev-ada/xmlada/xmlada-2017.ebuild
@@ -33,16 +33,17 @@ src_configure () {
 }
 
 src_compile () {
-	if use shared; then
-		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=relocatable \
+	build () {
+		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
 			-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
 			-cargs ${ADAFLAGS} || die "gprbuild failed"
+	}
+	if use shared; then
+		build relocatable
 	fi
 	for kind in static static-pic; do
 		if use ${kind}; then
-			gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=${kind} \
-				-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
-				-cargs ${ADAFLAGS} || die "gprbuild failed"
+			build ${kind}
 		fi
 	done
 }
@@ -53,11 +54,33 @@ src_test() {
 }
 
 src_install () {
+	local includedir=/usr/include/${PN}
+
+	fix_install () {
+		mv "${D}"${includedir}/$1.$2/* "${D}"${includedir}/$1/ || die
+		for file in "${D}"${includedir}/$1/*; do
+			dosym ../$1/$(basename ${file}) \
+				${includedir}/$1.$2/$(basename ${file})
+		done
+	}
+
 	for kind in shared static static-pic; do
 		if use ${kind}; then
 			emake PROCESSORS=$(makeopts_jobs) install-${kind}
 		fi
 	done
+	rm "${D}"/usr/lib/libxmlada_* || die
+	for dir in xmlada_{dom,input,sax,schema,unicode}; do
+		dodir /usr/include/${PN}/${dir}
+		if use shared; then
+			fix_install ${dir} relocatable
+		fi
+		for kind in static static-pic; do
+			if use ${kind}; then
+				fix_install ${dir} ${kind}
+			fi
+		done
+	done
 	einstalldocs
 	dodoc xmlada-roadmap.txt
 	rm "${D}"/usr/share/doc/${PN}/.buildinfo || die