[proaudio] proaudio/proaudio: [3099] rsound-9999: fix lib64 install

[subversion@xxxxxxxxxxxxx]

Revision: 3099
Author:   dominique
Date:     2017-08-19 10:57:38 +0200 (Sat, 19 Aug 2017)
Log Message:
-----------
rsound-9999: fix lib64 install

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/rsound/ChangeLog
    trunk/overlays/proaudio/media-sound/rsound/Manifest
    trunk/overlays/proaudio/media-sound/rsound/rsound-9999.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/rsound/files/
    trunk/overlays/proaudio/media-sound/rsound/files/lib64_install.patch

Modified: trunk/overlays/proaudio/media-sound/rsound/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/rsound/ChangeLog	2017-08-14 10:07:39 UTC (rev 3098)
+++ trunk/overlays/proaudio/media-sound/rsound/ChangeLog	2017-08-19 08:57:38 UTC (rev 3099)
@@ -1,7 +1,10 @@
 # ChangeLog for media-sound/rsound
 # Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
 
+  19 Aug 2017; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
+  rsound-9999.ebuild: fix libdir path.
++ lib64_install.patch
+
   20 Jul 2017; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
   rsound-*.ebuild: update to EAPI 6
 

Modified: trunk/overlays/proaudio/media-sound/rsound/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/rsound/Manifest	2017-08-14 10:07:39 UTC (rev 3098)
+++ trunk/overlays/proaudio/media-sound/rsound/Manifest	2017-08-19 08:57:38 UTC (rev 3099)
@@ -1,5 +1,6 @@
+AUX lib64_install.patch 1560 SHA256 728c6149bee9b5fd562e62602be4b374e2933b29ec1b91f4b60ed8de2a2238e2 SHA512 fcc4579fc4451ae35b9eb492eec1484103086c197c412fb8c90a6d912a67307270a6d17dfc44f297e411899aa7c547ec97cd91d478e368c4f84c45d5558f1d73 WHIRLPOOL c4386c9cf0cd9f49a62ff9230e4475ffebe6dcd62c1dfd03caa0a6138822194e4d5b7362573f579a5786b62a469cc67d708e5c556a5c852b029ee5cdc0a0ee65
 DIST rsound-1.0beta1.tar.gz 127742 SHA256 82d4bfb3d60492c6af34eaba3d5df0195a5962e3886a97295f9d3c228438e4e5 SHA512 672e40d46e16213aaf09bd63c1624938e4218dde93bce45b5aaa6de55bc8febc30734a0affc3764879698682a58ffbfe9e692f3cd004308250521f50a0f70dd2 WHIRLPOOL 28ee7a415c8c58b8c6ff0cfff5676c9cade4e2fbc55ed8689fc658c01de0add2bc5e4b50fcd9840d74d7f479c88e3dbb387abe3542792bb74d2632078bf761e1
 EBUILD rsound-1.0_beta1.ebuild 944 SHA256 64760b932d5d577823224e7c5b75a4a03f6b06bd6f7901619a4552d03fc9e1e1 SHA512 5e522ea83821cc709864d863a8bd32e3ab9adfea55107a3a4d3ceefda34de510ebc49999270dc55d2d80bf4596542a9bd13affeb153e5dfb9460fb0cdec83565 WHIRLPOOL 05d8d26e5c438b20d8d335228ab13fedab3bf203e6822b47c1b6bcf93576c99b2cd1b537688acc74ba6d3368971bcd96553c1f92d3198c8bda683d0d4f368863
-EBUILD rsound-9999.ebuild 877 SHA256 260565b67921b842db2fd6ea03ac0e66673d111c935afa2e18b94d07c45b8203 SHA512 3482176197118e9be51fe149eb56f4495dab56eeb28ae1297f5ba39917bd4c56836316ec5c39c6096aaa0085769e6c20c1cc350a25fbda2b70f488c22b123a26 WHIRLPOOL def67ee7807ec42626e86d24c76da7bb8943ac327ae35944d2a5c0f369898b86c68659e93bdede973f0f067d42a9b836ee5e2b3a4a4d6d41579c0c714c255245
-MISC ChangeLog 479 SHA256 2454dbbb6d96a5456db09203f0455717900aa4040853feee89b8b653a7f30f1c SHA512 0408be20b648e950a050cd0c33f2e42ac982fd052c0f6711866b98db5c4dc64bbbf12e881d1b8885c9fd9ace1d5de87756b782a08960baa6809f07d6f4ef2438 WHIRLPOOL 8643b97482312fb41d45eb656fb85360919d55c80b36127981eeac0d87fb0d0e51e96379e4bbc20ec3c242c80510efca6e37e8f0c5ddfee56a244c3b6c782803
+EBUILD rsound-9999.ebuild 976 SHA256 ef898da650c89ca4a7d3901e86e3dd954c335d3480186460610a833a34a93cb5 SHA512 083921e88b5d92acd7c163c55aa505ca4b28623b2f9f7bfb50353ed3e86d7f72c636a4f529c412c1071284ecc35f1fd4a53dbfadc9b51a8c6712976aee7a6462 WHIRLPOOL 786bca0ef8ad5c83034bc45ca2113da7c05afa0b88e1513f9c390706b22d2bf5009ea32135f5432fe60884e2d4eb4eb0e0227488a098826cbe821c918d009f79
+MISC ChangeLog 594 SHA256 cab1a1fa4ef377217a613d5f44f5574af26fde24041095c2242be107da701c4e SHA512 3134145d0ef6a901c0b4913df19dec873d4fb7f4e78636cf01166f1c00c8e5e8c6fbe23f50aaf626d2ae1759488c4929c4867562074e931e56e60cd9baebf343 WHIRLPOOL f572186c58dfc4d2675249bf95b470119be43054a26b3a1d16fd0ea3df1d3f968dcdaa07478b1289d1e80c03a18ed49c9bea24a4ef903b84c3b9015028e0e098
 MISC metadata.xml 261 SHA256 3812db1cff66d287c945fc7987f7d2cb37fea10ad28fdae3b7277beb8cfe7392 SHA512 590077890c7cc0e1fd1c8b4388764030dcf95e6bd04f996a73839809b011e666a859417ae2ec91eba8af11e4fe5bbe9c89791e1eccd23b7fc6ec43cca304e0b1 WHIRLPOOL 539e44c7fa67fe66d40aea271af64a7da8cb15c7f990400572ea7372b6268575cf1bf1d536772276b8df4340a7919392d21120a7f7321d198a24460b3b383154

Added: trunk/overlays/proaudio/media-sound/rsound/files/lib64_install.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/rsound/files/lib64_install.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/rsound/files/lib64_install.patch	2017-08-19 08:57:38 UTC (rev 3099)
@@ -0,0 +1,28 @@
+--- rsound-9999/src/Makefile.orig	2017-08-18 23:43:35.008638621 +0200
++++ rsound-9999/src/Makefile	2017-08-18 23:55:31.707612470 +0200
+@@ -171,18 +171,18 @@
+ 
+ 
+ install-lib: $(TARGET_LIB) $(TARGET_LIB_OBJ_STATIC) install-pkgconf
+-	mkdir -p $(DESTDIR)$(PREFIX)/lib/pkgconfig 2>/dev/null || /bin/true
++	mkdir -p $(DESTDIR)$(PREFIX)/lib64/pkgconfig 2>/dev/null || /bin/true
+ 	mkdir -p $(DESTDIR)$(PREFIX)/include 2>/dev/null || /bin/true
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1 2>/dev/null || /bin/true
+-	mkdir -p $(DESTDIR)$(PREFIX)/lib/ckport/db 2>/dev/null || /bin/true
+-	install -m755 $(TARGET_LIB) $(DESTDIR)$(PREFIX)/lib
+-	install -m644 ../ckport/librsound.ckport $(DESTDIR)$(PREFIX)/lib/ckport/db
++	mkdir -p $(DESTDIR)$(PREFIX)/lib64/ckport/db 2>/dev/null || /bin/true
++	install -m755 $(TARGET_LIB) $(DESTDIR)$(PREFIX)/lib64
++	install -m644 ../ckport/librsound.ckport $(DESTDIR)$(PREFIX)/lib64/ckport/db
+ ifneq ($(PLATFORM),OSX)
+-	cp -P librsound/librsound.so librsound/librsound.so.3 $(DESTDIR)$(PREFIX)/lib
++	cp -P librsound/librsound.so librsound/librsound.so.3 $(DESTDIR)$(PREFIX)/lib64
+ endif
+-	install -m644 $(TARGET_LIB_OBJ_STATIC) $(DESTDIR)$(PREFIX)/lib
++	install -m644 $(TARGET_LIB_OBJ_STATIC) $(DESTDIR)$(PREFIX)/lib64
+ 	install -m644 librsound/rsound.h $(DESTDIR)$(PREFIX)/include
+-	install -m644 rsound.pc $(DESTDIR)$(PREFIX)/lib/pkgconfig
++	install -m644 rsound.pc $(DESTDIR)$(PREFIX)/lib64/pkgconfig
+ 	install -m644 ../doc/rsd.1 $(DESTDIR)$(PREFIX)/share/man/man1
+ 	install -m644 ../doc/rsdplay.1 $(DESTDIR)$(PREFIX)/share/man/man1
+ 

Modified: trunk/overlays/proaudio/media-sound/rsound/rsound-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/rsound/rsound-9999.ebuild	2017-08-14 10:07:39 UTC (rev 3098)
+++ trunk/overlays/proaudio/media-sound/rsound/rsound-9999.ebuild	2017-08-19 08:57:38 UTC (rev 3099)
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit git-r3
+inherit git-r3 multilib
 
 DESCRIPTION="Networked audio system to transfer audio data to a different computer."
 HOMEPAGE="http://www.rsound.org/";
@@ -24,6 +24,11 @@
 
 DOCS="AUTHORS ChangeLog DOCUMENTATION README"
 
+if [ "$(get_libdir)" == "lib64" ]
+then
+	PATCHES=( "${FILESDIR}"/lib64_install.patch )
+fi
+
 src_configure() {
 	./configure \
 		--prefix=/usr \