oss: Only install applications and man pages, drivers are in oss-driver

(Portage version: 2.2.0_alpha45/git/Linux x86_64, signed Manifest commit with key 84F20B43)

4 files changed, 61 insertions, 58 deletions

diff --git a/media-sound/oss/Manifest b/media-sound/oss/Manifest
index caf80b3..68dd957 100644
--- a/media-sound/oss/Manifest
+++ b/media-sound/oss/Manifest
@@ -1,14 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX oss.init 287 RMD160 b125624500a6fc9c9e250777e90104c50d4c2504 SHA1 793fa41dac4c16b02d203f1dd206e6500269da39 SHA256 5aa3a20185641ba7054765df36b00dd378f551adddd2912cfd0c1e5ecde787d1
 DIST oss-v4.2-build2004-src-gpl.tar.bz2 1790085 RMD160 7b62cb96bf363d1c0a4018e21b0737ec5ee3c5b5 SHA1 75c3ff1cf3e3bd5b351b1f778100387f998c7f3a SHA256 6a4ac364c6ed022467b23a9db137857afa9f8e9706a4bdbcb85b98efcde3f4a0
-EBUILD oss-4.2.2004.ebuild 1638 RMD160 291bc2fbda0772a9e9d5b8d636244f81be3b868b SHA1 69b7c5e5f029b7f488641fc9a63b7931d9320b26 SHA256 150b2672cf9e28faf1ccb2ce622ec6ce9023288f8cc71ed444c2a52bebe9aef5
-MISC metadata.xml 255 RMD160 cd8d8cec82e20fbae3ec50adc77e3a847bf1cf59 SHA1 5f93424a5e9854f99452b62eb10fff6f31dd797a SHA256 d51928368dff5a07c452c50b7f1a5866f6ef9fbf578e372ef378363259843f5e
+EBUILD oss-4.2.2004.ebuild 2079 RMD160 689b2351ac63b0813a3aa079c8a48b9ae92fb825 SHA1 e3e6461688d7d89b267219b0bafba0f736cc0108 SHA256 9085255282b456b83320adb44ea9898c0ff9337d043764b0a0bf1552f31bec84
+MISC metadata.xml 227 RMD160 1f3fcf9c4a4cba1f09f4fa4d0869d03049a1da52 SHA1 4022447d941f3158cfd612046c05a97494a8e1e4 SHA256 8f4b64f252a02a2209f8573a0c8cfa3d15ecb413eb8b3bd49fbd06890699dc63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4HjIMACgkQmWq1bYTyC0PZJAEAyIKd2g71cfkvGHzPRFWR5Tjk
-WdwLduOz0tpc4gekIn4A/20zqrdICa0xnP5GQ3yLcWw6nUl/cnX7TbRypM8VvR+V
-=Y97K
+iF4EAREIAAYFAk4fLRMACgkQmWq1bYTyC0MTvwD+KoFdSSnNwYCLP7gQucI4FJsi
+V78YpBq/jrUz6VvmYK0A/A/yNLy7Cf7prUbaRThfEeDXfto8xXcJDpoeb6bMuicc
+=ivCp
 -----END PGP SIGNATURE-----
diff --git a/media-sound/oss/files/oss.init b/media-sound/oss/files/oss.init
deleted file mode 100644
index d8e546c..0000000
--- a/media-sound/oss/files/oss.init
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-start() {
-	ebegin "Starting OSS"
-	/usr/sbin/soundon
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping OSS"
-	/usr/sbin/savemixer
-	/usr/sbin/soundoff
-	eend $?
-}
diff --git a/media-sound/oss/metadata.xml b/media-sound/oss/metadata.xml
index 6140e69..af1af97 100644
--- a/media-sound/oss/metadata.xml
+++ b/media-sound/oss/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<use>
-		<flag name="midi"></flag>
 		<flag name="salsa">Enable ALSA emulation</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/oss/oss-4.2.2004.ebuild b/media-sound/oss/oss-4.2.2004.ebuild
index 944e6a0..4dd0749 100644
--- a/media-sound/oss/oss-4.2.2004.ebuild
+++ b/media-sound/oss/oss-4.2.2004.ebuild
@@ -3,38 +3,30 @@
 # $Header: $
 
 EAPI=4
-inherit flag-o-matic multilib toolchain-funcs versionator
+inherit flag-o-matic toolchain-funcs versionator
 
 MY_PV=$(get_version_component_range 1-2)
 BUILD=$(get_version_component_range 3)
 MY_P=${PN}-v${MY_PV}-build${BUILD}-src-gpl
 
-DESCRIPTION="Open Sound System"
+DESCRIPTION="Open Sound System - applications and man pages"
 HOMEPAGE="http://developer.opensound.com/"
 SRC_URI="http://www.4front-tech.com/developer/sources/stable/gpl/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="midi salsa"
+IUSE="gtk salsa"
 
 S=${WORKDIR}/${MY_P}
 BUILD_DIR=${WORKDIR}/${PN}-build
 
 ### TODO ###
-# - fix --as-needed
-# - respect LDFLAGS
-# - USE_EXPAND for drivers
-# - disable stripping
-# - (automagic?) gtk+ ossxmix
-# - don't install via cp? (see FreeBSD)
-# - check libdir paths
-# - kernel checks (-> OSS emulation)?
+# - fix linking order for --as-needed
 
 src_prepare() {
 	# the build system forces shadow builds
 	mkdir "${BUILD_DIR}"
-	append-flags -Wl,--no-as-needed
 }
 
 src_configure() {
@@ -42,36 +34,66 @@ src_configure() {
 
 	local myconf=""
 
-	if use salsa; then
-		myconf="--enable-libsalsa=YES"
-	else
-		myconf="--enable-libsalsa=NO"
-	fi
-
-	if use midi; then
-		myconf+=" --config-midi=YES"
-	else
-		myconf+=" --config-midi=NO"
-	fi
+	use salsa || myconf="--enable-libsalsa=NO"
 
-	"${S}"/configure ${myconf} || die
+	HOSTCC=$(tc-getCC) \
+	"${S}"/configure \
+		--config-midi=YES \
+		${myconf} || die
 
-	find -name Makefile -exec sed -e "s:-Werror::" -i {} +
+	find -name Makefile -exec sed -e "s:-Werror::" \
+		-e "s:-Wall::" -i {} +
 }
 
 src_compile() {
 	cd "${BUILD_DIR}"
-	emake CC=$(tc-getCC) build
+
+	pushd cmd
+	if ! use gtk; then
+		# remove ossxmix from SUBDIRS
+		sed -e "s:ossxmix::" -i Makefile
+	fi
+
+	# disable stripping
+	sed -e "s:-s::" \
+		-i */Makefile
+		#-e "s:LDFLAGS=:LDFLAGS+=:" \
+
+	einfo "Building applications"
+	emake CC=$(tc-getCC)
+	popd
+
+	pushd lib
+	einfo "Building libraries"
+	emake CC=$(tc-getCC)
+	popd
 }
 
 src_install() {
 	cd "${BUILD_DIR}"
-	if [ "$(get_libdir)" != "lib" ]; then
-		mv prototype/usr/lib prototype/usr/$(get_libdir) || die
-	fi
-	sed -e "s:lib:$(get_libdir):" prototype/etc/oss.conf || die
-	cp -r prototype/* "${ED}" || die
-	dodoc RELNOTES.txt
-
-	doinitd "${FILESDIR}"/${PN}.init ${PN}
+	use salsa && dolib lib/libsalsa/.libs/libsalsa.so*
+
+	dolib lib/libOSSlib/libOSSlib.so
+
+	# linux-headers ships OSS3 API
+	#insinto /usr/include/linux
+	#doins include/soundcard.h
+
+	# install man pages
+	use gtk || rm cmd/ossxmix/ossxmix.man
+	rename man 1 cmd/*/*.man
+	doman cmd/*/*.1
+	rename .man .7 misc/man7/*.man
+	doman misc/man7/*.7
+	rename man 7 kernel/drv/*/*.man
+	doman kernel/drv/*/*.7
+	newman os_cmd/Linux/ossdetect/ossdetect.man ossdetect.8
+	newman noregparm/cmd/ossdevlinks/ossdevlinks.man ossdevlinks.8
+	newman noregparm/cmd/savemixer/savemixer.man savemixer.8
+	newman noregparm/cmd/vmixctl/vmixctl.man vmixctl.8
+
+	cd "target"
+	dosbin sbin/*
+	dobin bin/*
+	dolib lib/*
 }