proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

17 files changed, 918 insertions, 0 deletions

diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
new file mode 100644
index 000000000000..c9c1708e0294
--- /dev/null
+++ b/media-sound/audacious/Manifest
@@ -0,0 +1,14 @@
+DIST audacious-2.4.4.tgz 1344519 SHA256 76f84038a0360da80aeaddd1ec23e5a55fee5a120abffce97c4609958cdb30e8 SHA512 39b2f243863ac6dcd81dceaec7d0f3f1078ebf92336616c6d60016e1c9a79a90db7f3161cccfa13b2498a8efeeab3e3528b508ce9366653f96a6e2c9ae8148e3 WHIRLPOOL 57c246647aaca7b6f01047805dd1c4db9ed381460cc81a799d38cc4c9a06a86e01485ec0bddc8a0ddadc5d8685638aee1cad002405770235f6a64c8216054444
+DIST audacious-2.5.4.tar.gz 1221134 SHA256 47bc36010e84c2c9638537a42a8451743d55a699bf85c614f3b913596f6e2fcd SHA512 4c6cdcd19e2de468c60c3a65fd75320f47febf3890011a6d7ebf5886ea34179bfb98bbbedd822ceeb278a466a63ba47d0243c90dd8cc04bb814ac50d60b54a1d WHIRLPOOL 99fb1f1541647ee378ab771975691b40230d3a3f7051cc714e9a0276101f3eda92e00c2071b89e62c1211481c41a0a9722a9ca494e50c93a88d4d69a334aa14a
+DIST audacious-3.1.1.tar.bz2 766551 SHA256 50e229579a0ee06e88d2b123c8db6b373db73e87898e8b4843a1bd02e3cab8ac SHA512 507381330ffb20898ece803a5782047ef316925e749940cffff590129f4b5eef895c4062b20e59cc7663e51e45c5668565bff009e71d31a5ee03f4d0e720ee79 WHIRLPOOL c5d4695308b6a219de77aa0803d0975454814156ee9c1cac142781f092d66b48121d67f2834b3949efaef1e8f75ebe42cbf1b0559864e8ba6c06c2a1c83eef1c
+DIST audacious-3.1.tar.bz2 793321 SHA256 306db180cd269b072cfb23551b4139cd2af28d8afb6699836ad82aa3bcec3a46 SHA512 c80c44dc94bf25bbf0dbcb0a2de2c8a0e2cbdb7261792f7b12b96f7aaec049b227cd67704228ad6dcd33b955d0b4ce3393511eca036cbaf996f753e85c9f7141 WHIRLPOOL 195061cc46ac5b9d6e79fafc4736d756501955b144bf2e53c439c6175632507c57962e0a29adbd030168e6d08498f2aedaa520213fbe14dfd819e27e0951825d
+DIST audacious-3.2.2.tar.bz2 675192 SHA256 c69c20e48c2ed330a0ffb55f3a648b50323406e2a15ca407e3291f83e57042ee SHA512 e9c1e4c6c9bccac83f64280742036bfbab07737af903c8b3cf7d41dda0ce1c7d449eecba6c87918d750197cb8bd7b6c9eb034e670ea3a04cbcc3699de4762e36 WHIRLPOOL 0fe8ff2bcbd366ba0f887910f99bb4f691bca716c49a31f69a90b0ee4db209875514da8fa2c440ccaae934ff0bd10692f07713bf73cb89bddb00a7e0caf00f31
+DIST audacious-3.2.3.tar.bz2 695917 SHA256 aea8ad2f4da80fb58cf8b0e880585ab49ac42e8a02247c364ea29ccca5572bae SHA512 29bcb02240cfeca8611935a9093b6271bc52809515b07fdaf846457b914ff13c03d82332a762332a16cc7a036963c582f5ab2f0b25592312478dee3a38510c7e WHIRLPOOL d92d6a5f9cb2ef46138527c47adac50f44acf33f2dd89a624875467dff39e20e72be61eb4aebd9216306b70cce43abb75e5c286da3108ec7bc14d27127b0991a
+DIST audacious-3.2.4.tar.bz2 690943 SHA256 12a14542883407110d2b4367db38e8e0620d83a266388427f358a66689a4553a SHA512 a6d4ce6c352f875caa84b32d8ff30d49e787ca387f6a25cb6a7d44be7f5432c147259a9112b247497804ffc2959ffc2713a90eeed7204d55dd26607896d3936e WHIRLPOOL a50cc579b50266e581b7c25ee56b97a54433f1c5310dd8e34eec96c5d205e921ae781ff4207f87bf1d08800b1a94cbc2baedc84f72dad30f2b2fd35bfeb79b7f
+DIST audacious-3.3.3.tar.bz2 470286 SHA256 bda1074c98284471b8ded1caa5f640cdde6e8723fa8b3f4fd685de97228f7c94 SHA512 82593b3cb2b104e6d1dcbd87ff51dad0d8ff125065700db8349032fd4eb2bdf4d08f214fd575cc405914234817a6c3092c3cf4ad62c223b4287a44845b91350f WHIRLPOOL 646980115e8c3cbe2441700b4926adb528e9a2c1e234e82290a1e9c702f5eb7aa7e069d94af210ecee8337aae905bedf77055e7ff5b16043f670094c62a65855
+DIST audacious-3.3.4.tar.bz2 473345 SHA256 671cdbf9b6b722b4ff4f43bcf85da0bdd1dfdf461b510cf6ecdb9187a427fca7 SHA512 0da20e09dec3104f6e0c16a61eee7fdbd221e21d460544efd1dd2b2f12476f62f0f9042976e6b682510a21fb894fa8a089730ed7a780544e4b49ca6f5b0b6b89 WHIRLPOOL 38ae46e98e378d8b16dc3841f2ebf9907735cb7d2a204d00cc93837f132a0fdeab9acc6c1da40dd3ac0a41a1e33074a308a7941653e4d0ca5e1347b1ef24ed04
+DIST audacious-3.4.1.tar.bz2 474755 SHA256 57ed4d8378b1e753e266a82424c3ae595b6c0e88fc3e32957720cd6cc14ac971 SHA512 2a9e203544861a0b902b720823202ef1038927932826847dc9b9a9c321dbecc19e2187afbdeb62a22ee8e6348c7df609ad671c8c63da2abc003a37556df20ac3 WHIRLPOOL 4b8facfb9fb3187286a59f5ddbba4ec784a3fd42e2fcadf322ee27cd8d1ae08ee3d5e23cb5c56875d3d3a879c1dd7ba21407cf19ef400693b8ab7a0adc176087
+DIST audacious-3.5.1.tar.bz2 446632 SHA256 df380e1ade112c703f57bc3883c71a1025e8d77091a772b86c0f9072efa69507 SHA512 b9ae3e0647b2fe76856a79d014db53ccdbce9524b62522c626032cf4a8d67b3828c280dade79a0327f4f279ece39d6aa600405a018aea0a11707c1903f479fad WHIRLPOOL 9f3a0c4f894aeb7a7274cfbfa181f25c6e4fedfd302c6b79c1a2fac47195ff73250229477278da704240a1259f9592966a0b07afaede41c5f424fd1afad61a0a
+DIST audacious-3.6.2-gtk3.tar.bz2 539937 SHA256 ed951e588a9f3cb6766301cc387138a3fe2abc81c243eba478e4261390cb51ed SHA512 6667f71de1951265d7c8bfbd83079d67942c2c97323ffc7214394ef3f81b1f58e0432117417281833611964e88c629ef855bd90562da46be1c5d350a51c0d997 WHIRLPOOL 4e218ca1c236b3e02b20e5ed5bb9d91fd95d8132273de8451963c84e2aabb869298cf4c58704ab07036ed7c1e5a6b1ea7855f733812aaed7685b13ce7a4ecd9d
+DIST audacious-3.6.2.tar.bz2 539843 SHA256 b2fdb9f3cafd65b2afc50efea6f17a7a329547f1d394f525870e42cb0483cb04 SHA512 b2fbf0b0628031ae5c883108cb1963232b50381b44882bf01faa7e11cd645e10a1d686d9ed078305a2cda66d238feaf7bdffd45c512830d20cef6770df327dde WHIRLPOOL f7b069b7e1f9538032d1bc290c7d476f16b075cf44a5d5d2b6f582a9e95ca3aa3e0a87d21ca00d4fc57a19983a9e74f3ded5e883acbd990df2064ac75e3da69a
+DIST gentoo_ice-xmms-0.2.tar.bz2 51839 SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05 WHIRLPOOL b7a4409629a860021477f34f8886c40c005ea2ec34373d80e6a696323866e54f361e38c76b1ac536775ae5912308f11416e613dec791f21473f01a2fad35bcfd
diff --git a/media-sound/audacious/audacious-2.4.4.ebuild b/media-sound/audacious/audacious-2.4.4.ebuild
new file mode 100644
index 000000000000..4320150dc819
--- /dev/null
+++ b/media-sound/audacious/audacious-2.4.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=1
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+SRC_URI="http://distfiles.atheme.org/${MY_P}.tgz
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="altivec chardet nls session cpu_flags_x86_sse2"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.16
+	>=dev-libs/libmcs-0.7.1-r2
+	>=dev-libs/libmowgli-0.7.0:0
+	dev-libs/libxml2
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/gtk+-2.14:2
+	>=x11-libs/pango-1.8.0
+	session? ( x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-2.4.4"
+
+src_compile() {
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	econf \
+		--enable-dbus \
+		$(use_enable altivec) \
+		$(use_enable chardet) \
+		$(use_enable nls) \
+		$(use_enable session sm) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		|| die
+
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS README
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins "${WORKDIR}"/gentoo_ice/*
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacious/audacious-2.5.4.ebuild b/media-sound/audacious/audacious-2.5.4.ebuild
new file mode 100644
index 000000000000..08daba6a467b
--- /dev/null
+++ b/media-sound/audacious/audacious-2.5.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+SRC_URI="http://distfiles.atheme.org/${MY_P}.tar.gz
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="altivec chardet nls session cpu_flags_x86_sse2"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.16
+	>=dev-libs/libmcs-0.7.1-r2
+	>=dev-libs/libmowgli-0.9.50:0
+	dev-libs/libxml2
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/gtk+-2.14:2
+	>=x11-libs/pango-1.8.0
+	session? ( x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	chardet? ( app-i18n/libguess )
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-2.5.4"
+
+src_configure() {
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	econf \
+		--enable-dbus \
+		$(use_enable altivec) \
+		$(use_enable chardet) \
+		$(use_enable nls) \
+		$(use_enable session sm) \
+		$(use_enable cpu_flags_x86_sse2 sse2)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS README
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins "${WORKDIR}"/gentoo_ice/*
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacious/audacious-3.1.1.ebuild b/media-sound/audacious/audacious-3.1.1.ebuild
new file mode 100644
index 000000000000..04ac865306c0
--- /dev/null
+++ b/media-sound/audacious/audacious-3.1.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+SRC_URI="http://distfiles.atheme.org/${MY_P}.tar.bz2
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="chardet nls session"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.16
+	>=dev-libs/libmcs-0.7.1-r2
+	>=dev-libs/libmowgli-0.9.50:0
+	dev-libs/libxml2
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	x11-libs/gtk+:3
+	session? ( x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	chardet? ( >=app-i18n/libguess-1.1 )
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-3.1.1"
+
+src_configure() {
+	# Some gccs don't like "-z defs" on their command line. Explicitly make it a
+	# linker flag (bug 395213).
+	epatch "${FILESDIR}/audacious_ldflags.patch"
+
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	# Use of GTK+2 causes plugin build failures, bug #384185
+	econf \
+		--enable-dbus \
+		--enable-gtk3 \
+		$(use_enable chardet) \
+		$(use_enable nls) \
+		$(use_enable session sm)
+}
+
+src_install() {
+	default
+	dodoc AUTHORS NEWS README
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins "${WORKDIR}"/gentoo_ice/*
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacious/audacious-3.1.ebuild b/media-sound/audacious/audacious-3.1.ebuild
new file mode 100644
index 000000000000..3eaedb30465d
--- /dev/null
+++ b/media-sound/audacious/audacious-3.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+SRC_URI="http://distfiles.atheme.org/${MY_P}.tar.bz2
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="chardet nls session"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.16
+	>=dev-libs/libmcs-0.7.1-r2
+	>=dev-libs/libmowgli-0.9.50:0
+	dev-libs/libxml2
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	x11-libs/gtk+:3
+	session? ( x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	chardet? ( app-i18n/libguess )
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-3.1"
+
+src_configure() {
+	# Some gccs don't like "-z defs" on their command line. Explicitly make it a
+	# linker flag (bug 395213).
+	epatch "${FILESDIR}/audacious_ldflags.patch"
+
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	# Use of GTK+2 causes plugin build failures, bug #384185
+	econf \
+		--enable-dbus \
+		--enable-gtk3 \
+		$(use_enable chardet) \
+		$(use_enable nls) \
+		$(use_enable session sm)
+}
+
+src_install() {
+	default
+	dodoc AUTHORS NEWS README
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins "${WORKDIR}"/gentoo_ice/*
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacious/audacious-3.2.2-r1.ebuild b/media-sound/audacious/audacious-3.2.2-r1.ebuild
new file mode 100644
index 000000000000..f161c3d90b95
--- /dev/null
+++ b/media-sound/audacious/audacious-3.2.2-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils autotools
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="chardet +gtk gtk3 nls session"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.16
+	dev-libs/libxml2
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	session? ( x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	chardet? ( >=app-i18n/libguess-1.1 )
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-3.2.2"
+REQUIRED_USE="^^ ( gtk gtk3 )"
+
+src_prepare() {
+	epatch "$FILESDIR"/${P}-fix-build-gmodule.patch
+	eaclocal -I m4
+	eautoheader
+	eautoconf
+}
+
+src_configure() {
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	# Use of GTK+2 causes plugin build failures, bug #384185
+	econf \
+		--enable-dbus \
+		$(use_enable gtk3) \
+		$(use_enable chardet) \
+		$(use_enable nls) \
+		$(use_enable session sm)
+}
+
+src_install() {
+	default
+	dodoc AUTHORS README
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins "${WORKDIR}"/gentoo_ice/*
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacious/audacious-3.2.3.ebuild b/media-sound/audacious/audacious-3.2.3.ebuild
new file mode 100644
index 000000000000..8b814df68ad8
--- /dev/null
+++ b/media-sound/audacious/audacious-3.2.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+
+IUSE="chardet nls session"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.16
+	dev-libs/libxml2
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	x11-libs/gtk+:2
+	session? ( x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	chardet? ( >=app-i18n/libguess-1.1 )
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-3.2.3"
+
+src_prepare() {
+	epatch "$FILESDIR"/${P}-fix-mutex.patch
+}
+
+src_configure() {
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	# Use of gtk+:3 causes some plugins to not have preference pages
+	# and statusicon to not build. Disable till Audacious 3.3 when
+	# these issues will have been fixed.
+	econf \
+		--enable-dbus \
+		--disable-gtk3 \
+		$(use_enable chardet) \
+		$(use_enable nls) \
+		$(use_enable session sm)
+}
+
+src_install() {
+	default
+	dodoc AUTHORS README
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins "${WORKDIR}"/gentoo_ice/*
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacious/audacious-3.2.4.ebuild b/media-sound/audacious/audacious-3.2.4.ebuild
new file mode 100644
index 000000000000..4db974ad3cdf
--- /dev/null
+++ b/media-sound/audacious/audacious-3.2.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+
+IUSE="chardet nls session"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.16
+	dev-libs/libxml2
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	x11-libs/gtk+:2
+	session? ( x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	chardet? ( >=app-i18n/libguess-1.1 )
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-3.2.4"
+
+src_configure() {
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	# Disable gtk+:3 till Audacious 3.3
+	econf \
+		--enable-dbus \
+		--disable-gtk3 \
+		$(use_enable chardet) \
+		$(use_enable nls) \
+		$(use_enable session sm)
+}
+
+src_install() {
+	default
+	dodoc AUTHORS
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins "${WORKDIR}"/gentoo_ice/*
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacious/audacious-3.3.3.ebuild b/media-sound/audacious/audacious-3.3.3.ebuild
new file mode 100644
index 000000000000..07cd1ed6ece6
--- /dev/null
+++ b/media-sound/audacious/audacious-3.3.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+
+IUSE="chardet nls"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.30
+	dev-libs/libxml2
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	x11-libs/gtk+:3"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	chardet? ( >=app-i18n/libguess-1.1 )
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-3.3.3"
+
+src_configure() {
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	econf \
+		--enable-dbus \
+		$(use_enable chardet) \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+	dodoc AUTHORS
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins "${WORKDIR}"/gentoo_ice/*
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacious/audacious-3.3.4.ebuild b/media-sound/audacious/audacious-3.3.4.ebuild
new file mode 100644
index 000000000000..aa14e5980e1d
--- /dev/null
+++ b/media-sound/audacious/audacious-3.3.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+
+IUSE="chardet nls"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.28
+	dev-libs/libxml2
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	x11-libs/gtk+:3"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	chardet? ( >=app-i18n/libguess-1.1 )
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-3.3.4"
+
+src_configure() {
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	econf \
+		--enable-dbus \
+		$(use_enable chardet) \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+	dodoc AUTHORS
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins "${WORKDIR}"/gentoo_ice/*
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacious/audacious-3.4.1.ebuild b/media-sound/audacious/audacious-3.4.1.ebuild
new file mode 100644
index 000000000000..bcff67cda5b1
--- /dev/null
+++ b/media-sound/audacious/audacious-3.4.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+
+IUSE="chardet nls"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.28
+	dev-libs/libxml2
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	x11-libs/gtk+:3"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	chardet? ( >=app-i18n/libguess-1.1 )
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-3.4.1"
+
+src_configure() {
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	econf \
+		--enable-dbus \
+		$(use_enable chardet) \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+	dodoc AUTHORS
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins "${WORKDIR}"/gentoo_ice/*
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacious/audacious-3.5.1.ebuild b/media-sound/audacious/audacious-3.5.1.ebuild
new file mode 100644
index 000000000000..0adc3c903556
--- /dev/null
+++ b/media-sound/audacious/audacious-3.5.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+
+IUSE="chardet nls"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.28
+	dev-libs/libxml2
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	x11-libs/gtk+:3"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	chardet? ( >=app-i18n/libguess-1.2 )
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-3.5.1"
+
+src_configure() {
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	econf \
+		--enable-dbus \
+		$(use_enable chardet) \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+	dodoc AUTHORS
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins "${WORKDIR}"/gentoo_ice/*
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacious/audacious-3.6.2.ebuild b/media-sound/audacious/audacious-3.6.2.ebuild
new file mode 100644
index 000000000000..39cdf917d507
--- /dev/null
+++ b/media-sound/audacious/audacious-3.6.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+SRC_URI="!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
+	 gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+
+IUSE="chardet nls gtk3 qt5"
+DOCS="AUTHORS"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.28
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	virtual/freedesktop-icon-theme
+	chardet? ( >=app-i18n/libguess-1.2 )
+	!gtk3? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	qt5? ( dev-qt/qtcore:5
+	      dev-qt/qtgui:5
+	      dev-qt/qtwidgets:5 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-${PV}"
+
+src_unpack() {
+	default
+	if use gtk3 ; then
+		mv "${MY_P}-gtk3" "${MY_P}"
+	fi
+}
+
+src_configure() {
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	econf \
+		--enable-dbus \
+		$(use_enable chardet) \
+		$(use_enable nls) \
+		$(use_enable qt5 qt)
+}
+
+src_install() {
+	default
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins "${WORKDIR}"/gentoo_ice/*
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacious/files/audacious-3.2.2-fix-build-gmodule.patch b/media-sound/audacious/files/audacious-3.2.2-fix-build-gmodule.patch
new file mode 100644
index 000000000000..587b68fa1a49
--- /dev/null
+++ b/media-sound/audacious/files/audacious-3.2.2-fix-build-gmodule.patch
@@ -0,0 +1,51 @@
+commit 7b68fdab1dbd2ec3e8eeb37a7a0837d4d0e20851
+Author: John Lindgren <john.lindgren@aol.com>
+Date:   Mon Apr 2 16:50:39 2012 -0400
+
+    Use GMODULE_{CFLAGS,LIBS}.
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 6f6f293..5acb6b7 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -194,6 +194,7 @@ AC_PATH_PROG([WINDRES], [windres])
+ dnl Check for Gtk+/GLib and pals
+ dnl ============================
+ AUD_CHECK_MODULE([GLIB], [glib-2.0], [>= 2.16], [Glib2])
++AUD_CHECK_MODULE([GMODULE], [gmodule-2.0], [>= 2.16], [GModule])
+ AUD_CHECK_MODULE([GTHREAD], [gthread-2.0], [>= 2.16], [GThread])
+ AUD_CHECK_MODULE([PANGO], [pango], [>= 1.20], [Pango])
+ AUD_CHECK_MODULE([CAIRO], [cairo], [>= 1.6], [Cairo])
+diff --git a/extra.mk.in b/extra.mk.in
+index 464bbb0..1ff2a08 100644
+--- a/extra.mk.in
++++ b/extra.mk.in
+@@ -21,6 +21,8 @@ DBUS_CFLAGS ?= @DBUS_CFLAGS@
+ DBUS_LIBS ?= @DBUS_LIBS@
+ GLIB_CFLAGS ?= @GLIB_CFLAGS@
+ GLIB_LIBS ?= @GLIB_LIBS@
++GMODULE_CFLAGS ?= @GMODULE_CFLAGS@
++GMODULE_LIBS ?= @GMODULE_LIBS@
+ GTHREAD_CFLAGS ?= @GTHREAD_CFLAGS@
+ GTHREAD_LIBS ?= @GTHREAD_LIBS@
+ GTK_CFLAGS ?= @GTK_CFLAGS@
+diff --git a/src/audacious/Makefile b/src/audacious/Makefile
+index ea95c85..22dad64 100644
+--- a/src/audacious/Makefile
++++ b/src/audacious/Makefile
+@@ -99,6 +99,7 @@ pre-depend: ${DBUS_BINDINGS}
+ CPPFLAGS := -I.. -I../.. \
+             ${CPPFLAGS} \
+ 		${GLIB_CFLAGS}			\
++		${GMODULE_LIBS} \
+ 		${GTHREAD_CFLAGS} \
+ 		${GTK_CFLAGS}			\
+ 		${AUDACIOUS_DEFINES}	\
+@@ -119,6 +120,7 @@ LIBS := -L../libaudcore -laudcore \
+ 		${LIBINTL}						\
+ 		${EGGSM_LIBS}					\
+ 		${GLIB_LIBS}					\
++		${GMODULE_LIBS} \
+ 		${GTHREAD_LIBS} \
+ 		${GTK_LIBS}						\
+ 		${DBUS_LIBS}					\
diff --git a/media-sound/audacious/files/audacious-3.2.3-fix-mutex.patch b/media-sound/audacious/files/audacious-3.2.3-fix-mutex.patch
new file mode 100644
index 000000000000..3fb209196f83
--- /dev/null
+++ b/media-sound/audacious/files/audacious-3.2.3-fix-mutex.patch
@@ -0,0 +1,89 @@
+commit b53935921298b8164f80454c2016bd40de29704b
+Author: John Lindgren <john.lindgren@aol.com>
+Date:   Sat May 26 11:55:42 2012 -0400
+
+    Fix violation of mutex locking order (playback then playlist). Found by Helgrind.
+
+diff --git a/src/audacious/playlist-new.c b/src/audacious/playlist-new.c
+index 6407f64..596fbaa 100644
+--- a/src/audacious/playlist-new.c
++++ b/src/audacious/playlist-new.c
+@@ -822,6 +822,7 @@ void playlist_reorder (int from, int to, int count)
+ 
+ void playlist_delete (int playlist_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing ())
+         playback_stop ();
+ 
+@@ -969,6 +970,7 @@ int playlist_get_active (void)
+ 
+ void playlist_set_playing (int playlist_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing ())
+         playback_stop ();
+ 
+@@ -1112,6 +1114,7 @@ void playlist_entry_insert_batch_raw (int playlist_num, int at,
+ 
+ void playlist_entry_delete (int playlist_num, int at, int number)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing () &&
+      playlist_get_position (playlist_num) >= at && playlist_get_position
+      (playlist_num) < at + number)
+@@ -1225,6 +1228,7 @@ int playlist_entry_get_length (int playlist_num, int entry_num, bool_t fast)
+ 
+ void playlist_set_position (int playlist_num, int entry_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing ())
+         playback_stop ();
+ 
+@@ -1423,6 +1427,7 @@ int playlist_shift (int playlist_num, int entry_num, int distance)
+ 
+ void playlist_delete_selected (int playlist_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing () &&
+      playlist_get_position (playlist_num) >= 0 && playlist_entry_get_selected
+      (playlist_num, playlist_get_position (playlist_num)))
+@@ -2023,6 +2028,7 @@ static bool_t shuffle_prev (Playlist * playlist)
+ 
+ bool_t playlist_prev_song (int playlist_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing ())
+         playback_stop ();
+ 
+@@ -2110,6 +2116,7 @@ static void shuffle_reset (Playlist * playlist)
+ 
+ bool_t playlist_next_song (int playlist_num, bool_t repeat)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing ())
+         playback_stop ();
+ 
+@@ -2253,6 +2260,11 @@ int playback_entry_get_end_time (void)
+ 
+ void playlist_save_state (void)
+ {
++    /* get playback state before locking playlists */
++    resume_state = playback_get_playing () ? (playback_get_paused () ?
++     RESUME_PAUSE : RESUME_PLAY) : RESUME_STOP;
++    resume_time = playback_get_playing () ? playback_get_time () : 0;
++
+     ENTER;
+ 
+     char * path = g_strdup_printf ("%s/" STATE_FILE, get_path (AUD_PATH_USER_DIR));
+@@ -2261,10 +2273,6 @@ void playlist_save_state (void)
+     if (! handle)
+         LEAVE_RET_VOID;
+ 
+-    resume_state = playback_get_playing () ? (playback_get_paused () ?
+-     RESUME_PAUSE : RESUME_PLAY) : RESUME_STOP;
+-    resume_time = playback_get_playing () ? playback_get_time () : 0;
+-
+     fprintf (handle, "resume-state %d\n", resume_state);
+     fprintf (handle, "resume-time %d\n", resume_time);
+ 
diff --git a/media-sound/audacious/files/audacious_ldflags.patch b/media-sound/audacious/files/audacious_ldflags.patch
new file mode 100644
index 000000000000..e030b1af5dae
--- /dev/null
+++ b/media-sound/audacious/files/audacious_ldflags.patch
@@ -0,0 +1,11 @@
+--- configure.old	2012-01-17 12:41:09.000000000 +0000
++++ configure	2012-01-17 12:41:42.000000000 +0000
+@@ -4759,7 +4759,7 @@
+     *linux*)
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-        LDFLAGS="$LDFLAGS -z defs"
++        LDFLAGS="$LDFLAGS -Wl,-z,defs"
+         ;;
+     *)
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
diff --git a/media-sound/audacious/metadata.xml b/media-sound/audacious/metadata.xml
new file mode 100644
index 000000000000..cf82d9d8a5f2
--- /dev/null
+++ b/media-sound/audacious/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <maintainer>
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <use>
+    <flag name="chardet">Try to handle non-UTF8 chinese/japanese/korean ID3 tags</flag>
+	<flag name="gtk3">Link against version 3 of the GIMP Toolkit instead of version 2 (x11-libs/gtk+)</flag>
+  </use>
+</pkgmetadata>