Make xmlto an optional dep, bug 246526

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

3 files changed, 106 insertions, 2 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index a2eae21aa3fa..455c8d3d18bf 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.258 2009/03/31 09:34:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.259 2009/04/10 04:26:28 beandog Exp $
+
+*alsa-utils-1.0.19-r2 (10 Apr 2009)
+
+  10 Apr 2009; Steve Dibb <beandog@gentoo.org> +alsa-utils-1.0.19-r2.ebuild:
+  Make xmlto an optional dep, bug 246526
 
   31 Mar 2009; Raúl Porcel <armin76@gentoo.org> alsa-utils-1.0.16.ebuild,
   alsa-utils-1.0.17.ebuild:
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 5eeb4fd05d90..079e6f640297 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -27,6 +27,7 @@ EBUILD alsa-utils-1.0.16.ebuild 2317 RMD160 abcfe243c8573155e90aeb79efce8494ff03
 EBUILD alsa-utils-1.0.17.ebuild 2702 RMD160 8bd436bddc376b564fed547883923abe065e7a16 SHA1 e3cbda7257695c4e37882476fab74c98623309ae SHA256 1908a9e1544f0a4cc4e3eb16ef0c5d0b620c614b20d55f3dbefcce3b058772dc
 EBUILD alsa-utils-1.0.18.ebuild 2680 RMD160 373cd2689aa08caacb8ae902107b5363f39eb896 SHA1 a18d8c1166cea6186cbb8544e5a0b01d28130770 SHA256 7b3c8b1eef256d6da70563ab3cd9d5b8795438b0e5562e3227bedaec0b06773a
 EBUILD alsa-utils-1.0.19-r1.ebuild 2841 RMD160 cc27bf79c72ef3fb116a11daa5279278e570addb SHA1 837ad0e002eb24b6d4d8b6d97d7e81e858765da7 SHA256 c61054f4b20abef83dcb6812725f2de5b41abf4bcfccd77ce835977b2fcc56df
+EBUILD alsa-utils-1.0.19-r2.ebuild 2982 RMD160 9539e7fb978bdd6fee6347f7011c25e8000c83c8 SHA1 dc51494b6413002a9fa33d2759038748c1a15446 SHA256 1091e8584f2b81a861bb4efd29c51481976d0f1c5045df20dbc1bb20b0104a14
 EBUILD alsa-utils-1.0.19.ebuild 2836 RMD160 6856cbf7613d372fc1e14109137bed92cf2cc379 SHA1 595deea2369f2ad24fbb21c9efdbfe98196e9919 SHA256 59187bcffabf236912fc43d70fe485daf26e8e65cfbee2f584c33d738b09ec2b
-MISC ChangeLog 39143 RMD160 4915730f33145e5f043a13549118457bd5c0ddde SHA1 cf399627f10da89b88189fb00313629b2a55de0e SHA256 4d155bfa9ba20b7b3da8be876c661e71b8c24e2a84f33728302958e40ab5cb33
+MISC ChangeLog 39299 RMD160 3da3a767b16fbd0dc645630ce5bb4aa2841cdc3b SHA1 8c0b22230c04011835975950114d698c03a7736e SHA256 02c475c2dc2e51bc9bddb8624c2c017018f68d8e83ee328505201426d1d8d23b
 MISC metadata.xml 313 RMD160 268cddbeb91eb55d326ff5736fe51e704b22db82 SHA1 2a144ccf9aa1c3789e7b25cd0e9083c5ce345b67 SHA256 4777a7e011441b62b0e6db0b35035fa99d36a0657aac31f406c7cbeaef906801
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.19-r2.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.19-r2.ebuild
new file mode 100644
index 000000000000..05c09488c103
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.0.19-r2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2009 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.19-r2.ebuild,v 1.1 2009/04/10 04:26:28 beandog Exp $
+
+inherit eutils
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="doc nls midi minimal"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	dev-util/dialog
+	>=media-libs/alsa-lib-${PV}
+	doc? ( app-text/xmlto )"
+RDEPEND=">=sys-libs/ncurses-5.1
+	dev-util/dialog
+	>=media-libs/alsa-lib-${PV}
+	virtual/modutils
+	!minimal? ( sys-apps/pciutils )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use midi && ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror ""
+		eerror "To be able to build alsa-utils with midi support you need"
+		eerror "to have built media-libs/alsa-lib with midi USE flag."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+}
+
+src_compile() {
+
+	local myconf=""
+	use doc || myconf="--disable-xmlto"
+
+	econf ${myconf} \
+		$(use_enable nls) \
+		$(use_enable midi sequencer) \
+		|| die "configure failed"
+
+	emake || die "make failed"
+}
+
+pkg_preinst() {
+	if [[ -a /etc/modules.d/alsa ]] && [[ ! -a /etc/modprobe.d/alsa ]]; then
+		elog "Moving old alsa configuration in modules.d to new"
+		elog "location in modprobe.d in /etc/"
+		mv "${ROOT}/etc/modules.d/alsa" "${ROOT}/etc/modprobe.d/alsa"
+	fi
+}
+
+src_install() {
+	local ALSA_UTILS_DOCS="ChangeLog README TODO
+		seq/aconnect/README.aconnect
+		seq/aseqnet/README.aseqnet"
+
+	emake DESTDIR="${D}" install || die "Installation Failed"
+
+	dodoc ${ALSA_UTILS_DOCS} || die
+	newdoc alsamixer/README README.alsamixer || die
+
+	newinitd "${FILESDIR}/alsasound-1.0.19-r1.initd" alsasound
+	newconfd "${FILESDIR}/alsasound-1.0.19.confd" alsasound
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}/alsa-modules.conf-rc" alsa
+
+	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
+	elog "The script will load ALSA modules, if you choose to use a modular"
+	elog "configuration. The Gentoo ALSA developers recommend you to build"
+	elog "your audio drivers into the kernel unless the device is hotpluggable"
+	elog "or you need to supply specific options (such as model= to HD Audio)."
+	echo
+	ewarn "Automated unloading of ALSA modules is deprecated and unsupported."
+	ewarn "Should you choose to use it, bug reports will not be accepted."
+	echo
+	if use minimal; then
+		ewarn "The minimal use flag disables the dependency on pciutils that"
+		ewarn "is needed by alsaconf at runtime."
+	fi
+}