oss: Install init/conf files and fix gtk+ dependency

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

4 files changed, 43 insertions, 6 deletions

diff --git a/media-sound/oss/Manifest b/media-sound/oss/Manifest
index 16251e8..28851de 100644
--- a/media-sound/oss/Manifest
+++ b/media-sound/oss/Manifest
@@ -4,13 +4,15 @@ Hash: SHA256
 AUX oss-4.2.2004-as-needed-strip.patch 2597 RMD160 4948e06fa2f42b7e9d7272a3f293c02693150bb5 SHA1 30eae3caaadadf17d50236d60e5692c25544900f SHA256 1dbe483d08ba25380791f9637b6c95235f71091fd1480580979d72ca4e9c2b6e
 AUX oss-4.2.2004-filesystem-layout.patch 6703 RMD160 fee44548032c6fd88ddff2a90e514b997918d797 SHA1 33aae9b12ca5cd0bd34beb105ed8ed77da2c207f SHA256 552b5ffc08dfa8bda20d12febcfcf9e66919dec6fb4f21c88e64415b1488c81d
 AUX oss-4.2.2004-txt2man.patch 340 RMD160 9211cd9f851843f1354ee6a8eddfab2fe04e3409 SHA1 df56f9001f11a0cb3552c37212ba7732e9640f08 SHA256 66b3895c68a58d419c004240fb915539c32e73f199fc36dcbfd9aa71f4dde28f
+AUX oss.conf 103 RMD160 aa2bb42cfd9137ab7cdf546267dca9dd1f3448dd SHA1 61ff7da9e8d87680d71651beb93b16a7b0fbcd9e SHA256 d135e1b36855e9c6ef1c110150b91df16cc1fe31e08ebec8bdaa5bb7dc95699f
+AUX oss.init 344 RMD160 7a90f308376ed44f8f5074ff5febe93977eec862 SHA1 d1b869f10343670fb2f93260c487533778da46ce SHA256 28f72cd8208211e41f2bfa60556157a45f2bc685ce6c13568be3f20b0f5466f5
 DIST oss-v4.2-build2004-src-gpl.tar.bz2 1790085 RMD160 7b62cb96bf363d1c0a4018e21b0737ec5ee3c5b5 SHA1 75c3ff1cf3e3bd5b351b1f778100387f998c7f3a SHA256 6a4ac364c6ed022467b23a9db137857afa9f8e9706a4bdbcb85b98efcde3f4a0
-EBUILD oss-4.2.2004.ebuild 2492 RMD160 42add509c13edb7b7ff47536a23b2eb48c91d344 SHA1 b828553a87bfac527e4578ee09af9f992f52e6ab SHA256 658f2b0246f54fa318f2aa98a546d7fd1ebdb4dc4af2f5a1acb22a36db0e555e
+EBUILD oss-4.2.2004.ebuild 2622 RMD160 782b0ca9596c6a4f9e6e81ec485e4cb812b2c302 SHA1 a9e7e01cf3afe0b5d00477a79ecdb70fb678cf64 SHA256 edcb916eb35cd317c95ece38839fdd0c16609b0e2ac5824450357f6ba8f102bf
 MISC metadata.xml 227 RMD160 1f3fcf9c4a4cba1f09f4fa4d0869d03049a1da52 SHA1 4022447d941f3158cfd612046c05a97494a8e1e4 SHA256 8f4b64f252a02a2209f8573a0c8cfa3d15ecb413eb8b3bd49fbd06890699dc63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4fa0IACgkQmWq1bYTyC0N6YAEAvgMcebi7GRzL6npvp+/lioSB
-qZmTUjjaG3VcrRMe+ysA/jOhoyeM7s0JxsCNAAo60mjsFSaM4gb40H3O+lftPH7k
-=MVKp
+iF4EAREIAAYFAk4iyWIACgkQmWq1bYTyC0M7QQD/SKVHWI+JyHKpaq9Wa4jLClNM
+0BM0JgnTMmI4PBJdbckA/121jrZQrkdF0CpYAPEs6nMKDd58k+7Ja8rlGKJeC7ke
+=fEPr
 -----END PGP SIGNATURE-----
diff --git a/media-sound/oss/files/oss.conf b/media-sound/oss/files/oss.conf
new file mode 100644
index 0000000..a0bc12a
--- /dev/null
+++ b/media-sound/oss/files/oss.conf
@@ -0,0 +1,5 @@
+# /etc/conf.d/oss
+# $Header: $
+
+# Space-spearated list of drivers to load on startup
+DRIVERS="hdaudio"
diff --git a/media-sound/oss/files/oss.init b/media-sound/oss/files/oss.init
new file mode 100644
index 0000000..23d864c
--- /dev/null
+++ b/media-sound/oss/files/oss.init
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+opts="save"
+
+start() {
+	for i in ${DRIVERS}; do
+		modprobe oss_${i}
+	done
+	ossdetect -d
+	ossdevlinks
+}
+
+stop() {
+	modprobe -r osscore
+
+	save
+}
+
+save() {
+	ebegin "Saving mixer levels"
+	savemixer
+	eend $?
+}
diff --git a/media-sound/oss/oss-4.2.2004.ebuild b/media-sound/oss/oss-4.2.2004.ebuild
index adf97a0..bac11eb 100644
--- a/media-sound/oss/oss-4.2.2004.ebuild
+++ b/media-sound/oss/oss-4.2.2004.ebuild
@@ -18,7 +18,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gtk salsa"
 
-RDEPEND="x11-libs/gtk+:2"
+RDEPEND="media-sound/oss-driver
+	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}
 	app-text/txt2man"
 
@@ -27,7 +28,7 @@ BUILD_DIR=${WORKDIR}/${PN}-build
 
 ### TODO ###
 # - fix linking order for --as-needed
-# - fix man pages
+# - fix man pages (savemixer installed twice)
 
 src_prepare() {
 	# the build system forces shadow builds
@@ -113,4 +114,7 @@ EOF
 	dolib lib/*
 
 	dodir /var/lib/oss4
+
+	doinitd "${FILESDIR}"/${PN}.init
+	doconfd "${FILESDIR}"/${PN}.conf
 }