media-sound/gogglesmm: Bump. Removed old svn -9999 ebuild, need fox-1.7 for new VCS versions

svn path=/sunrise/; revision=12330

4 files changed, 25 insertions, 66 deletions

diff --git a/media-sound/gogglesmm/ChangeLog b/media-sound/gogglesmm/ChangeLog
index 837faaf59..80efa0e05 100644
--- a/media-sound/gogglesmm/ChangeLog
+++ b/media-sound/gogglesmm/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Aug 2011; James Broadhead (hangfire) <jamesbroadhead@gmail.com>
+  -gogglesmm-0.12.1.ebuild, +gogglesmm-0.12.2.ebuild,
+  -gogglesmm-9999.ebuild:
+  Bump. Removed old svn -9999 ebuild, need fox-1.7 for new VCS versions
+
   25 Apr 2011; James Broadhead (hangfire) <jamesbroadhead@gmail.com>
   -gogglesmm-0.11.5.ebuild, +gogglesmm-0.12.1.ebuild, gogglesmm-9999.ebuild,
   metadata.xml:
diff --git a/media-sound/gogglesmm/Manifest b/media-sound/gogglesmm/Manifest
index c3c29ca41..1f3450d0d 100644
--- a/media-sound/gogglesmm/Manifest
+++ b/media-sound/gogglesmm/Manifest
@@ -1,5 +1,4 @@
-DIST gogglesmm-0.12.1.tar.bz2 385271 RMD160 e8c2688df8f5ee2e3e10f51785b4bc5ab200518a SHA1 d5d3cee22701f74b74aa0e92be87e6fed1fba017 SHA256 698f322f5db9c6cd1f86ca4fde10de06841a28e6681ddbe7cca2c51d3689a3df
-EBUILD gogglesmm-0.12.1.ebuild 999 RMD160 7316af5c23cd2724f0119516dce5289afb9a252d SHA1 33d545b14b2c30d380deefc9e32b465b4acff26e SHA256 b84ec529d1560c597db678549a11b83ab9b6dbb3e047dc524589ae94227ab02a
-EBUILD gogglesmm-9999.ebuild 1005 RMD160 d98ee3e42af823ad945944969c82dd900e52e77f SHA1 e64d8f9624332cd783c646eaaffe6ebf24c12fd4 SHA256 b548d80ccb04d613f531a159c894331e03f6e090122b049cfc8787cf79df432f
-MISC ChangeLog 1969 RMD160 3266561e86f32eb916769a127926c3f64485c027 SHA1 9eb73b8e5ae884dd49ae7b6ec52e4cfad01f034c SHA256 22bbc1be5662dfaa08897940c53fee71401232b04d224b539b432b12f90e4df0
+DIST gogglesmm-0.12.2.tar.bz2 403947 RMD160 02024d496a4864c032e887f42df69af51cce0d27 SHA1 ad876ac3d7d888153e3caf31366c8075845cce99 SHA256 b1895627986b1a4df7df47035b620cf8eaea1f79bb365412e2334928474bf099
+EBUILD gogglesmm-0.12.2.ebuild 1192 RMD160 4f6833a9bba0e01bf889314a43a2b4ae3e63c2a4 SHA1 e862cfd0616f8de5f5d87d19b12f69fc869a00f9 SHA256 dfaf0b2f066069531e3e14eb56b5ca7c41871bd6ec1ef83f980d61b4498c9708
+MISC ChangeLog 2191 RMD160 27e6df22a8831b5ffdb8c495c296f3b4d3d8e650 SHA1 361e6a667afac9f59d1354407c8b67b968d2ca69 SHA256 4b739bb9cf2b40b5ba6f93b335192e68703123635e9069775ffc26bda5f6be38
 MISC metadata.xml 447 RMD160 e54654160874e4db2765249a8d59b0f6e389399d SHA1 768dc23b4f5f9779478e914a88f1589a8fab4cff SHA256 ae29bf5c7e8258553c77c4f1178170d5d1252f2dfd9f3cf7c47bdd617b6661c1
diff --git a/media-sound/gogglesmm/gogglesmm-0.12.1.ebuild b/media-sound/gogglesmm/gogglesmm-0.12.2.ebuild
index 036ee1e70..b6254bc9b 100644
--- a/media-sound/gogglesmm/gogglesmm-0.12.1.ebuild
+++ b/media-sound/gogglesmm/gogglesmm-0.12.2.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=2
 
+inherit autotools-utils
+
 DESCRIPTION="Lightweight FOX music collection manager and player"
 HOMEPAGE="http://gogglesmm.googlecode.com/"
 SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
@@ -22,28 +24,32 @@ RDEPEND="dev-db/sqlite:3
 	gcrypt? ( dev-libs/libgcrypt )"
 DEPEND="${RDEPEND}"
 
+DOCS=(AUTHORS README)
+# Upstream patch to fix parallel builds. Won't be needed >=0.12.3
+PATCHES=( "${FILESDIR}/${PN}-parallel-make.patch" )
+
+AUTOTOOLS_IN_SOURCE_BUILD=0
+
 src_prepare() {
 	sed -i -e 's:icons/hicolor/48x48/apps:pixmaps:' Makefile || die
+	autotools-utils_src_prepare
 }
 
 src_configure() {
-	local extraconf=""
+	local myeconfargs=""
+
 	if use gcrypt ; then
-		extraconf="--with-md5=gcrypt"
+		myeconfargs="--with-md5=gcrypt"
 	else
-		extraconf="--with-md5=internal"
+		myeconfargs="--with-md5=internal"
 	fi
 
-	econf ${extraconf} $(use_with dbus)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
+	myeconfargs="${myeconfargs} $(use_with dbus)"
 
-	dodoc AUTHORS README || die
+	autotools-utils_src_configure
 }
 
 pkg_postinst() {
-	elog "For asf or mp4 tag support, build "
-	elog "media-libs/taglib with USE=\"asf mp4\""
+	elog "For asf and/or mp4 tag support, build "
+	elog "    media-libs/taglib with USE='asf mp4'"
 }
diff --git a/media-sound/gogglesmm/gogglesmm-9999.ebuild b/media-sound/gogglesmm/gogglesmm-9999.ebuild
deleted file mode 100644
index a33b763e9..000000000
--- a/media-sound/gogglesmm/gogglesmm-9999.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit subversion
-
-DESCRIPTION="Lightweight FOX music collection manager and player"
-HOMEPAGE="http://gogglesmm.googlecode.com/"
-ESVN_REPO_URI="http://${PN}.googlecode.com/svn/trunk"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="dbus gcrypt"
-
-RDEPEND="dev-db/sqlite:3
-	media-libs/taglib
-	media-libs/xine-lib
-	net-misc/curl
-	x11-libs/fox[png]
-	dbus? ( sys-apps/dbus )
-	gcrypt? ( dev-libs/libgcrypt )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e 's:icons/hicolor/48x48/apps:pixmaps:' Makefile || die
-}
-
-src_configure() {
-	local extraconf=""
-	if use gcrypt ; then
-		extraconf="--with-md5=gcrypt"
-	else
-		extraconf="--with-md5=internal"
-	fi
-
-	econf ${extraconf} $(use_with dbus)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS README || die
-}
-
-pkg_postinst() {
-	elog "For asf or mp4 tag support, build "
-	elog "media-libs/taglib with USE=\"asf mp4\""
-}