Removed old version; update copyright

Package-Manager: portage-2.1.11.47/cvs/Linux x86_64
Manifest-Sign-Key: 0xB5BBDC30

4 files changed, 18 insertions, 90 deletions

diff --git a/media-sound/xwax/ChangeLog b/media-sound/xwax/ChangeLog
index 6d56e6ade7ed..fddd8b38558c 100644
--- a/media-sound/xwax/ChangeLog
+++ b/media-sound/xwax/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/xwax
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/ChangeLog,v 1.45 2013/01/22 00:37:40 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/ChangeLog,v 1.46 2013/01/22 00:45:11 nixphoeni Exp $
+
+  22 Jan 2013; Joe Sapp <nixphoeni@gentoo.org> -xwax-1.0.ebuild:
+  Removed old version; update copyright
 
   22 Jan 2013; Joe Sapp <nixphoeni@gentoo.org> metadata.xml:
   Remove old flags
diff --git a/media-sound/xwax/Manifest b/media-sound/xwax/Manifest
index 0a61f009a5c6..ff9e22931471 100644
--- a/media-sound/xwax/Manifest
+++ b/media-sound/xwax/Manifest
@@ -1,6 +1,14 @@
-DIST xwax-1.0.tar.gz 54094 SHA256 8d5617bb11c964e9ec5b85ed9a3f004d4f0728ca0ae65b238443404c5bc0358d SHA512 85b136a51a3fbff18840b084d54a2555997c8c1a6c7ac112c78b5c83d1f9ecd3243c9ae86b78155af2624e16dd22ce508d2897c4dca287292d9fb21fe71a5bfd WHIRLPOOL 5523d27febdc4f821c8c6c95d77949ffe37e828664c02b9b401b14a83ff3b3048e49479db524da473babc78226016d7a717089b757b18cf78048d2924e030ddc
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST xwax-1.2.tar.gz 64910 SHA256 2e35aafb2a08d29c611e19a54b3e45b5c7243cf53b2aec1634c87f01fb35e6a9 SHA512 a36ce3f950df5f19e64c70325d507a95880b3c8e22eaed592bdf9545989632badfde87ed89c4129dc1e26266980ebdb6c15255edd2bc2aac9ff5c3d8fc88287d WHIRLPOOL 7d608bee6b808d779865ce5ae9d1c1402d4b409cb2fd20bda959bbbddf0ca1f9a7981e9f271a3f1a0e9b4972108a153e6b16cd181294a0acb9d2b4af85ddd5ad
-EBUILD xwax-1.0.ebuild 2372 SHA256 727842845449aee4e3e1a0f30d1937b1b661ecba35f7f4e32db6c74b72711607 SHA512 c06ebe86e3ec1b0c6e512395403d1d7ac9f7a827470399910cb8af88b2c82e23f4793a58a075c2949c66531d74e7e23f52428391438728d4f581472a3bfaacab WHIRLPOOL 5c470a050c60e39f7866aef0034667639921b53d13c653d3225adbb338d2a662d87bf26cd0feea52c0e380a2ad937101c44f05c85a06608caeb95456e8dbd946
-EBUILD xwax-1.2.ebuild 2366 SHA256 eb1ae96e5a6a67f267c64fad0c5d9a1c8e6cea2bd1878821f1ca34f9955c3ded SHA512 f472076c953ebcded0be87585876f69494e86aec2f6f3c07184a7220483391925dc254dbd44a3027e1a0f3adbfee281564b4b4f7bed7a9f34a34f6d4658aaded WHIRLPOOL 78243cdc83e89547a98671111748be26b21416ced19a55c5d7df29d945199ccc7870fde2d1232ed6ab2d1807c5070fa4f60a27c4e5aea59d49e6c61eb097bb7b
-MISC ChangeLog 6452 SHA256 a6f94762ffd8a845571d3dac072097db398953402530103a4de97a691a0e2e51 SHA512 ff273e94e1b9336de74955fad6b115da5fa24ba4bb1ad2a2994a2484079ba65c94895276fcb1157fa74b63627c368d540b263d30422125e8b33c03df8e1fdf99 WHIRLPOOL e56bd4c89beaa27a17d8e52752c5d899262268fbae4a6c17d2ec23ed5c40d65e5c39a4cfb55be37628d9f1265f53846870e048a3c48302dd82d41baf1e4452b7
+EBUILD xwax-1.2.ebuild 2372 SHA256 751f885bf5b839356f9311664d2f4659baf522fc028f19d4ca8cb5af8d19f62f SHA512 1f74df818b9487dca76ded7748ad75e310f7b3b9b60700705995fa97cdaf2eb08a2a1b57fac49ad27bf64043bf0c9f8d3b119af52e33b76936f86bd431cfc66c WHIRLPOOL b2897d7f0407794dc8eefcdaba8c3c067f0ab4c586fc9a3a8eff6da8013ac11091a9dd3f53567ab72e055d9dc42bc3374ab1eae336cdefd0b04b1736d8ad0a84
+MISC ChangeLog 6558 SHA256 443bc5d99242d7daae9603a5a3db10259d9385f957a0cd2d5002d5e958671b6a SHA512 7c6374c2a7f04176424bb25c1480203db7bdce793c72d7cb596c22c2e6544297ae618186f3fedab118c431518e05e4b81eb749d29f9c4821bd71ee65be4e07b5 WHIRLPOOL 65fc92112e0ba57b9bf242ebba111ffce7e0392d745dd55b8fc3f527411d14d3645a84f1fcf775597de2082e606f51a45bfc41b5894da299ec94935d042ac329
 MISC metadata.xml 800 SHA256 93e47a41347f5647d7f9d559d15bb16fe0726875130e90560aef6760613cfa67 SHA512 dcd3f3c3f78e2f3616c134554f708fdf47877dcd0cc7b33b26d403bc17f98b748da0cdfdf7225a59773106f7fc04621b52a7eb5f6e65951213e9fe30a8fd6299 WHIRLPOOL 74988bef754275e1ba24eab54d574f9514ddffc3f253d6860af6f62e07b71f943f60fdebaa7ded9c87c3f1936d8d99714fd94e7dc3a819398f3bdd202889785b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlD94RoACgkQCKzbxbW73DAO3wD9F7QISVW/3lJkJBAqXsSGkJpE
+ksoon/xM55o7FypVhBMBAN4MFVu/djClde6lqvG2e+yT4I51miCPi9/n0avQjtKn
+=llqZ
+-----END PGP SIGNATURE-----
diff --git a/media-sound/xwax/xwax-1.0.ebuild b/media-sound/xwax/xwax-1.0.ebuild
deleted file mode 100644
index 3a3b3ae6ead5..000000000000
--- a/media-sound/xwax/xwax-1.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/xwax-1.0.ebuild,v 1.5 2012/02/25 15:10:13 ssuominen Exp $
-
-EAPI=4
-inherit toolchain-funcs
-
-DESCRIPTION="Digital vinyl emulation software"
-HOMEPAGE="http://www.xwax.co.uk/"
-SRC_URI="http://www.xwax.co.uk/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="alsa jack oss cdda mp3 +fallback"
-REQUIRED_USE="|| ( cdda mp3 fallback )
-	|| ( alsa jack oss )"
-
-RDEPEND="sys-libs/glibc
-	media-libs/libsdl
-	media-libs/sdl-ttf
-	media-fonts/dejavu
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	cdda? ( media-sound/cdparanoia )
-	mp3? ( || ( media-sound/mpg123 media-sound/mpg321 ) )
-	fallback? ( virtual/ffmpeg )"
-DEPEND="${RDEPEND}"
-
-DOCS="README CHANGES"
-
-src_prepare() {
-	# Remove the forced optimization from 'CFLAGS' and 'LDFLAGS' in
-	# the Makefile
-	# Also remove the dependency on the .version target so we don't need
-	# git just to build
-	sed -i -e 's/\(^\(LD\|C\)FLAGS.*\)-O[0-9]\(.*\)/\1\3/g' \
-		-e 's/^xwax\.o:.*\.version//' \
-		Makefile || die "sed failed"
-
-	# Replace any decoder commands in the import script, if necessary
-	if [[ `use mp3` ]]; then
-		# mpg123 is upstream's default
-		if has_version media-sound/mpg123; then
-			TO="mpg123"
-			FROM="mpg321"
-		# Otherwise, use mpg321
-		else
-			TO="mpg321"
-			FROM="mpg123"
-		fi
-		debug-print "found ${TO}"
-		sed -i -e "s:${FROM}:${TO}:g" import || \
-			die "problem converting xwax-import to use ${TO}"
-	fi
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		--prefix "${EROOT}usr" \
-		$(use_enable alsa) \
-		$(use_enable jack) \
-		$(use_enable oss)
-}
-
-src_compile() {
-	# EXECDIR is the default directory in which xwax will look for
-	# the 'xwax-import' and 'xwax-scan' scripts
-	emake EXECDIR="\$(BINDIR)" VERSION="${PV}"
-}
-
-src_install() {
-	# This is easier than setting all the environment variables
-	# needed, running the sed script required to get the man directory
-	# correct, and removing the GPL-2 after a 'make install' run
-	dobin xwax || die "failed to install xwax"
-	newbin import xwax-import || die "failed to install xwax-import"
-	newbin scan xwax-scan || die "failed to install xwax-scan"
-	doman xwax.1 || die "failed to install man page"
-
-	dodoc ${DOCS} || die "failed to install docs"
-}
diff --git a/media-sound/xwax/xwax-1.2.ebuild b/media-sound/xwax/xwax-1.2.ebuild
index 43caf3665e8b..59433c76e207 100644
--- a/media-sound/xwax/xwax-1.2.ebuild
+++ b/media-sound/xwax/xwax-1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/xwax-1.2.ebuild,v 1.5 2012/08/23 19:10:03 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/xwax-1.2.ebuild,v 1.6 2013/01/22 00:45:11 nixphoeni Exp $
 
 EAPI=4
 inherit toolchain-funcs