Query correct udevdir from udev.pc pkg-config file.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 111 insertions, 4 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 4d75052b7d55..e106acae48f7 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.324 2012/07/23 15:04:38 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.325 2012/08/10 17:24:24 ssuominen Exp $
+
+*alsa-utils-1.0.25-r3 (10 Aug 2012)
+
+  10 Aug 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +alsa-utils-1.0.25-r3.ebuild:
+  Query correct udevdir from udev.pc pkg-config file.
 
   23 Jul 2012; <swift@gentoo.org> alsa-utils-1.0.23-r1.ebuild,
   alsa-utils-1.0.24.2-r1.ebuild, alsa-utils-1.0.25.ebuild,
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 32deb8eb9fc0..555e52dffc2e 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX alsa-modules.conf-rc 1028 SHA256 6060c101ca0793ea80e2b6b5bb8d6b118325092788ff26f07c280dd1ff546570 SHA512 20b309a44e23408ede66a121d81047f32970fa033728784c76a1caabb72143dbc1c5b970f9e73a910b7ef9026df597cde2afc7c1f52127fab532dba4955b1757 WHIRLPOOL 75fdfe4802af6a020bc6a4d46da7872b3481657f13d92e30c9fa61d5accdd8cd19b14a0c813c454d2ca89fa655f5ad375c0163fa4f947342ee759ab80a4700e4
 AUX alsa-utils-1.0.23-alsactl-output.patch 1010 SHA256 b26deef95b4e665ae9e8e8b5c7ec745876126b5a81804e79833abcdee8a0ddb0 SHA512 90c8dc557bdfcb65c0c6276f9c33336c33b734afc427eab91ad99470ae278127e83471342741f60ee58ec67d3527bd1a1dffbeddeb2eb6b7103e270b287bb9bd WHIRLPOOL 38af64faad9c2afff1e7f090f2a105d3e6f048beb3d13c01e9058f8989573c276ab0c0383e53076b824de8453799a3dc21ce83cc69c57fa6c3faf8f632ba2e13
 AUX alsa-utils-1.0.23-alsactl-output2.patch 853 SHA256 5425e156b8f7f82a088cd7fa2cd17843f439f465c82e3a18f7f4ca8c3ebd9b3e SHA512 970c6bd41212c099c96ea9d02b2401960d5ae2a3e39d7c37907e3eba2f6dabaa01e61986599a328171b250e74c84fa099d30d65f4dee3cf9c41536baca611cf9 WHIRLPOOL 3e4615d8b8723dd2eb329e6c3de16f1615054b94d793f266d75c480edb49e1aff816584a511b8bdb85b71011069fad6ae9dd9740b4fcd0ec98853cc2b7103114
@@ -7,16 +10,28 @@ AUX alsasound.confd-r3 874 SHA256 e5d26a6ea993540ca2d67aee4b40f1351b13f2c8023d53
 AUX alsasound.confd-r4 340 SHA256 d1c55400b701a72dcb8bb85e016b5013fa3eb6a2766ffc20dae278d0ee4c1a43 SHA512 90c1e974276945f7632dc370a005b58d669b93edbf27116098d4831e69c11c26d9b21e7eacfaf12c50019f8c88dc1f370101e2d905fdde40887fe36bac00d83e WHIRLPOOL 0f46fe17f1a6626c3e2c8438d5006fdc8a302456820c2dfaa27955c295532aa1543e7ec0161702edd874e9588b6a383369693f080c91b0b38813b91588fc1e75
 AUX alsasound.initd-r4 6249 SHA256 a4421f45d61182095ccd9470857173058ff1af0d92b07f3e3cc3af65d630021d SHA512 7a73cac2d35bce80d79f14f2270097f3793f82d171f1f558ac2a6f072b850928a3b1656b7b0cf619b1c0cc40ae888d5a85b90045009d9f3a2ccc393b5345eab0 WHIRLPOOL 0a6cd0f6040e9c56c10280f8f82c3a586c721acb6443be15e50e3d3c6493f69a3ae5eb5f56b5fa2ebcce0c4ab468fd9870a9531794231e102240cba41a25ec15
 AUX alsasound.initd-r5 2099 SHA256 daf46bbc4156a82e0c6c7135ee94b31a3dfb6d366fcf3f45e8c842d1348601be SHA512 3b1399afd10551516545677fd6d8ef676e1eaaca5d76580563b9906b2de86854b8afef864b92dead342d41f3c3c342bff1bc6bd704f932677a524ba4e585a405 WHIRLPOOL 862d943d7d0742c00de9e02cff9b3fe159805880b3e0ea70e50c8c449e8b8c1cfa47d26286bd0807840b1f24c9c9c8cbaef890d71dab43644b52105efb2e7fae
-DIST alsa-driver-1.0.23.tar.bz2 3337645 RMD160 bdefa689616bd6b21e75837f4ee4afc4d7bd4583 SHA1 b7d376cd3e664ba13b6dfb8278546f1b61189a14 SHA256 0641da5be2de9ca2fa1b234d479063280238290e253a94492c87c573bf445f22
+DIST alsa-driver-1.0.23.tar.bz2 3337645 SHA256 0641da5be2de9ca2fa1b234d479063280238290e253a94492c87c573bf445f22
 DIST alsa-driver-1.0.24.tar.bz2 3609960 SHA256 fe8aa69b209879dd6df820237a28cddcf1bed5417710e53336ec7281b5f48d2b SHA512 b3c1bd9299f2f9ffe73b428028ef7922d13793bc5c9dabfd67c42adb283581cf2a4b004cd929aab8fa5a916171d6b6e9fc58f33835c752595d6a1f59fbc6d327 WHIRLPOOL 26acaa7db77086115857c3b33a77fa9fdfb70da90f56e165374a459b6820c45b8aed4b73bb328c35dc91c9dcd617a2fa3c811adb1aab1380629e70f28faee3a2
 DIST alsa-driver-1.0.25.tar.bz2 3861484 SHA256 d80e219fd410b5bc62f9332e5964acd575cc8a0bcda80fa41d5eebeabde0ebc3 SHA512 51164c5f1c6e40e188be8e544ddc610b56ffb7d696bc925a0a30e6819d6cbd90a7f9f33c379d411d0e7a172a3ed1cf15b59c27654d63db1a9bad2051331d3017 WHIRLPOOL b70a3614baf72cc2762a2b8a65e07af0204c8550aa140aa01f7d5ee998a8cdf54f43600cfb61c2cb4773d55813afd9aef845f4219d955fbf0f3bc085cf003c7d
-DIST alsa-utils-1.0.23.tar.bz2 1076937 RMD160 af741d41fec054a7173eba5827adb01afbeaa407 SHA1 52dc9260e21960231c084109f16979e70e36ab03 SHA256 b7d05e915e25f8540ad151c6dd558cf0fc1e9bb0ee23052d531c983666a1f7b0
+DIST alsa-utils-1.0.23.tar.bz2 1076937 SHA256 b7d05e915e25f8540ad151c6dd558cf0fc1e9bb0ee23052d531c983666a1f7b0
 DIST alsa-utils-1.0.24.2.tar.bz2 1130734 SHA256 95127f740291086486c06c28118cabca0814bde48fd14dac041a9812a5ac1be2 SHA512 9436194a8e404b7e5bd593aecb5c1b2a7fdda4c0d70c9a8696f2096bf399dad8a2bd7fec89f025af91ca25b51f1c77aaf46e3c5add300e7ca5253cda3afaec5f WHIRLPOOL 6f8039fec5424416bbff654b3916e0094d56fde34c14ea286f3158e3d6b15e2187950234fc7ae5fde58b24c3f61cef70640506f12beadbad29eb595ca44050f3
 DIST alsa-utils-1.0.25.tar.bz2 1132780 SHA256 2e676a2f634bbfe279b260e10a96f617cb72ee63c5bbf6c5f96bb615705b302c SHA512 2f2c8ed880d8fa07f6a507f7040a291b1509f1d9bb26aee8549aa1238d7e691dc372bc5271547fd76eabe5b67f781050cd84b28c13910171bd4afdcb5d6444e1 WHIRLPOOL a2fb6da26b02cac87ca00d71901e71fd9b4bb1b9f6e94387b2f5e833ba8c5a02f25b8a75f48110c686c05cb25752a1806ed3d8c04769e12addea0c89aafa471c
 EBUILD alsa-utils-1.0.23-r1.ebuild 3291 SHA256 48671c2b6b1fe80b4bec03d99c864fcabd3dafd19143a2747a7a7a8849c98ab8 SHA512 880bf9babb8ccdd249edc3de409d4f0926d6c4ef06ab80f34a43f30d653f69ae04ec70dff26d5e30d0314d7e97a32c86c3da109986c916a122703d6a44ce5b87 WHIRLPOOL 656f700b344d4837597b25343888d7dfc564cfd264f74b9a4257a0187a61c693bfa8bd5c0bfc60da93833350af8f9944fa8d54444ec4d87532a5eac9233287a8
 EBUILD alsa-utils-1.0.24.2-r1.ebuild 2972 SHA256 96555abe04e834f619864124531380dbbf8b30ecac47cbd258d525358294c6fd SHA512 03b2de7ea46b157491a1ea9b4d77e9b70fd22cde41de68aa39ed739ba45295dabd1c78afcf7111c3f587750a7d780d5ce25304e603800d024456f2e03b1ebfc8 WHIRLPOOL d8d2bc1ff145cc0229dc28f0bdb1ad6cbd7338c737ce29c8d0bb1bb5bac6592de4649a896339be798df8503a44fb4cdb65454fe559d72c03c606fb00a0250d18
 EBUILD alsa-utils-1.0.25-r1.ebuild 2269 SHA256 2e7f36738da607fc0f76e741f20715577d358d1eef33ecd1b4795964b1296b78 SHA512 010ff6d09b9333c9214906ca68f0b0d79112e4b6a0f7b91393aef9abbabbd1add9b1f5930082c63e08bb847909d2addee53c8d8cb2a941c1e36e092e4b929ddb WHIRLPOOL c242e9b4954e12ef3acad0a23a278746b44c7ebbc2feec95f15a5fa4fce4f87ffd5d8e07af48091083f620ddf937b9d194a00ccfe9bd75068fc7885f6d0011ca
 EBUILD alsa-utils-1.0.25-r2.ebuild 2314 SHA256 390c2b9879049dd81d79e7f1ea82cc4dcf671d148157de8cf57f85578676aad0 SHA512 0a054830bf689183c7cdad7bd95707947900588c64a24c45319b9fcd855a3174c0d8df7339a01fbae9dde72815656df51f29da7cb51576a3734e10e51c0dd6ce WHIRLPOOL 0ee3478b3945cb79a19d6c01f15722818b1535c86cdc01df94d4e8f0b0cfcffd5ec7a81a870a966fa06b6a92cba53e381cb48b2c1ce18f2467c98b0a1fe2a7f4
+EBUILD alsa-utils-1.0.25-r3.ebuild 2511 SHA256 21d1e80a18cdaee91f36b1a022da768aff2c0bf1997086fe4c550b577b954eab SHA512 de5a83683506d458aead006215f7ff70c5f31d79662fbec4f2f1823a75d965bbfe6307cba6faf4703f96c3d5b35d9af3a130baa769745e9a9f2a023ab1d66470 WHIRLPOOL 74116ade7958c4267c803771d05ec7c6e9a863e45cbc62ebc1deab00c25dc5022cf21a7ac176772d5c9272cdde113b1a331f42da034b777a2aeefd9a64e693e2
 EBUILD alsa-utils-1.0.25.ebuild 2882 SHA256 429728911d4bf5b435bc04f12868b225a58ef838f47b1f620668253e94ec8790 SHA512 e47fb0df15a37d3dedfde9f629d1c2d81f780ba7d5c5032049c01e50d49b1d07768aa06d561e0fc2056e528be6d5a708fbeeff3785cca48db5142af05862482e WHIRLPOOL dbf60d1bce824b79e75fe7f85c4bd5fd9bb32bd106af8dcfe047838187fa16cf527b0d478af38aac8a0eb87539f6c0e52430610e95a176cfd8b93e09de1d2a08
-MISC ChangeLog 49679 SHA256 bc49ae7fb9c4d6d44220c71002a33319f1c7f873dc4dc79936f984a7c77d7bae SHA512 5acd95918922de842bce12e8426a900dd87aba6297311a6ce140e667dfb90e0d4b932064cbd34d749fcd752675edd4f66dcf7fa9359970dfc5681fb2fb00224f WHIRLPOOL 152f2a56b91fa4a5aa735b69ed9f894b979bb1cc87d70ed7fdba282891d0a911ea70909f43916935237ca07b7f3bf003fa65f424b1378f0d8403bd7ffeb5e916
+MISC ChangeLog 49861 SHA256 356af03dfaa1d150ef2e1b7b333cb77cbc198330d9be7ded5589a6c55764cad8 SHA512 0b61d48fcc7d1bc453d5262ebeb6ba4151a58a7ef2490696e271d88aa64f5d6159e76647a6db028c3e108a66eeb728ef2bd4139caad04ffbf5f4163916cf83e7 WHIRLPOOL e7d15b32fcf923662c34a61ee0f73d76d23b2317454c9770f85dbd0bc7a0eadc012369c9fb36598819a9d582c98b81950f36a63e0acc5384e215ff6d1d45b26e
 MISC metadata.xml 230 SHA256 1f81ba2d193a0ca53dcedb87b01a28851a9d7b14d77db3b2c2647330f4ba6f00 SHA512 88eb296bc7f80d8c2a2f7145401f37e13a89d84bb87a267d4f7c0e6f9caae43747fb9a92de96fbdc5c3ba6a25e861148a5c9b1a20f588b06ecb2fbbb9555f35f WHIRLPOOL 7d2facc317d281f6e251013e28c23c66a50a8e555ab143485615072016dce537aa487b7873baea11f9124e64770aa543962be57937654f7a93b461d38ce9694f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQJUOwAAoJEEdUh39IaPFNszwH+wZd/P5kKHgJJ/cyl2FSrri0
++yUnyoiPEJNivPgVqipqmMmkraEA6nwbRTP3js0Sx8zXP1lJAx6cP5lFLp1BoZDz
+ynvMX2fM5U98EJGikc4JNiWo4fjqpbzWi8xoMG6ihyuClnJfAf4kZIbmqUeadYPC
+x9ncz4+XSSqPLL1ZZ5BTq6zA8HsCbSIxpMmF0ToUcPcYGC66FrgVif1BPaPwbcoT
+LOWzVqiVymH8JUGiV10MOLck/Lu8AObs1GF27mDXyMDjf7lZaF4Fw5HKigdiKR1R
+g0pV5PbSCnfuq+NUORLWYZMgacx/wNl0JyqjaAsjkAbnJccw/7eeK4Aj2RgDHUg=
+=tq7S
+-----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.25-r3.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.25-r3.ebuild
new file mode 100644
index 000000000000..4226292883ab
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.0.25-r3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.25-r3.ebuild,v 1.1 2012/08/10 17:24:24 ssuominen Exp $
+
+EAPI=4
+inherit base systemd toolchain-funcs
+
+MY_P=${P/_rc/rc}
+
+DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/utils/${MY_P}.tar.bz2
+	mirror://alsaproject/driver/alsa-driver-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="doc nls minimal selinux"
+
+COMMON_DEPEND=">=sys-libs/ncurses-5.1
+	dev-util/dialog
+	>=media-libs/alsa-lib-1.0.25
+	media-libs/libsamplerate
+	selinux? ( sec-policy/selinux-alsa )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )"
+RDEPEND="${COMMON_DEPEND}
+	!minimal? ( sys-apps/pciutils )"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=(
+"${FILESDIR}/${PN}-1.0.23-modprobe.d.patch"
+"${FILESDIR}/${P}-separate-usr-var-fs.patch"
+)
+
+src_configure() {
+	local myconf=""
+	use doc || myconf="--disable-xmlto"
+
+	local udevdir=/lib/udev
+	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+
+	econf ${myconf} \
+		$(use_enable nls) \
+		$(use_enable !minimal alsaconf) \
+		"$(systemd_with_unitdir)" \
+		--with-udev-rules-dir="${udevdir}"/rules.d
+}
+
+src_install() {
+	local ALSA_UTILS_DOCS="ChangeLog README TODO
+		seq/aconnect/README.aconnect
+		seq/aseqnet/README.aseqnet"
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc ${ALSA_UTILS_DOCS} || die
+
+	newbin "${WORKDIR}/alsa-driver-${PV}/utils/alsa-info.sh" \
+		alsa-info
+
+	newinitd "${FILESDIR}/alsasound.initd-r5" alsasound
+	newconfd "${FILESDIR}/alsasound.confd-r4" alsasound
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}/alsa-modules.conf-rc" alsa.conf
+
+	keepdir /var/lib/alsa
+}
+
+pkg_postinst() {
+	echo
+	elog "To take advantage of the init script, and automate the process of"
+	elog "saving and restoring sound-card mixer levels you should"
+	elog "add alsasound to the boot runlevel. You can do this as"
+	elog "root like so:"
+	elog "	# rc-update add alsasound boot"
+	echo
+	ewarn "The ALSA core should be built into the kernel or loaded through other"
+	ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
+	echo
+	if use minimal; then
+		ewarn "The minimal use flag disables the dependency on pciutils that"
+		ewarn "is needed by alsaconf at runtime."
+	fi
+}