7 files changed, 14 insertions, 49 deletions
diff --git a/media-plugins/mythweather/ChangeLog b/media-plugins/mythweather/ChangeLog
index 2768f47e5a08..56ab3f528471 100644
--- a/media-plugins/mythweather/ChangeLog
+++ b/media-plugins/mythweather/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/mythweather
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythweather/ChangeLog,v 1.13 2004/04/20 17:46:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythweather/ChangeLog,v 1.14 2004/06/01 17:23:26 aliz Exp $
+
+*mythweather-0.15 (01 Jun 2004)
+
+  01 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> mythweather-0.11.ebuild,
+  mythweather-0.12.ebuild, mythweather-0.15.ebuild:
+  Version bump and cleanups.
 
   20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
   mythweather-0.11.ebuild, mythweather-0.12.ebuild, mythweather-0.13.ebuild,
diff --git a/media-plugins/mythweather/Manifest b/media-plugins/mythweather/Manifest
index 756ee0493839..74d1f78e5eab 100644
--- a/media-plugins/mythweather/Manifest
+++ b/media-plugins/mythweather/Manifest
@@ -2,9 +2,11 @@ MD5 c81de3dc23aa29251e966ed5c018c343 mythweather-0.12.ebuild 995
 MD5 86e8a7863834dbe93e152da25951407c mythweather-0.14.ebuild 1009
 MD5 03f2f8eae7bff731832df0d77c5af8f1 mythweather-0.11.ebuild 988
 MD5 7e8a136d64e0e47789317c20f9d7f8c2 mythweather-0.13.ebuild 995
+MD5 86e8a7863834dbe93e152da25951407c mythweather-0.15.ebuild 1009
 MD5 1dd5b43df06cecb4ae48cf9d7c7dc9ef ChangeLog 2281
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
 MD5 6a31e4f0a87c61e3e7f0eb55dca2f03b files/digest-mythweather-0.11 69
 MD5 916ba5d7844b0abae782627b8d1a21fe files/digest-mythweather-0.12 69
 MD5 ea775d05013e97dd4c419804de2ed3b6 files/digest-mythweather-0.13 69
 MD5 1ab52ed2da7b97e38a6f31621371a400 files/digest-mythweather-0.14 69
+MD5 acf4a287fc12a8d0a64dc92ac04c4522 files/digest-mythweather-0.15 69
diff --git a/media-plugins/mythweather/files/digest-mythweather-0.11 b/media-plugins/mythweather/files/digest-mythweather-0.11
deleted file mode 100644
index 0f0b4fe72b99..000000000000
--- a/media-plugins/mythweather/files/digest-mythweather-0.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 22ec089fb144ef2c316b028c67d266af mythweather-0.11.tar.bz2 814175
diff --git a/media-plugins/mythweather/files/digest-mythweather-0.12 b/media-plugins/mythweather/files/digest-mythweather-0.12
deleted file mode 100644
index 14f49fcf11a2..000000000000
--- a/media-plugins/mythweather/files/digest-mythweather-0.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8daad867e4eaf04506401975647d6144 mythweather-0.12.tar.bz2 824577
diff --git a/media-plugins/mythweather/files/digest-mythweather-0.15 b/media-plugins/mythweather/files/digest-mythweather-0.15
new file mode 100644
index 000000000000..ab8bfda83312
--- /dev/null
+++ b/media-plugins/mythweather/files/digest-mythweather-0.15
@@ -0,0 +1 @@
+MD5 0e1f011e3572dc3fd7a5fb9aa00d91e1 mythweather-0.15.tar.bz2 847427
diff --git a/media-plugins/mythweather/mythweather-0.11.ebuild b/media-plugins/mythweather/mythweather-0.11.ebuild
deleted file mode 100644
index 0d601c4958eb..000000000000
--- a/media-plugins/mythweather/mythweather-0.11.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythweather/mythweather-0.11.ebuild,v 1.4 2004/04/20 17:46:53 eradicator Exp $
-
-IUSE=""
-
-inherit flag-o-matic
-
-DESCRIPTION="Weather forcast module for MythTV."
-HOMEPAGE="http://www.mythtv.org/"
-SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND=">=sys-apps/sed-4
-	|| ( >=media-tv/mythtv-${PV} >=media-tv/mythfrontend-${PV} )"
-
-src_unpack() {
-	unpack ${A}
-
-	for i in `grep -lr "usr/local" "${S}"` ; do
-		sed -e "s:/usr/local:/usr:" -i "${i}" || die "sed failed"
-	done
-}
-
-src_compile() {
-	cpu="`get-flag march`"
-	if [ ! -z "${cpu}" ] ; then
-		sed -e "s:pentiumpro:${cpu}:g" -i "${S}/settings.pro" || die "sed failed"
-	fi
-
-	qmake -o "${S}/Makefile" "${S}/${PN}.pro"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	einstall INSTALL_ROOT="${D}"
-	dodoc AUTHORS COPYING README
-}
diff --git a/media-plugins/mythweather/mythweather-0.12.ebuild b/media-plugins/mythweather/mythweather-0.15.ebuild
index 7c6bd435b4ad..46f0d5d621d3 100644
--- a/media-plugins/mythweather/mythweather-0.12.ebuild
+++ b/media-plugins/mythweather/mythweather-0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythweather/mythweather-0.12.ebuild,v 1.4 2004/04/20 17:46:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythweather/mythweather-0.15.ebuild,v 1.1 2004/06/01 17:23:26 aliz Exp $
 
 IUSE=""
 
@@ -12,13 +12,13 @@ SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 
 DEPEND=">=sys-apps/sed-4
-	|| ( >=media-tv/mythtv-${PV} >=media-tv/mythfrontend-${PV} )"
+	|| ( >=media-tv/mythtv-${PV}* >=media-tv/mythfrontend-${PV}* )"
 
 src_unpack() {
-	unpack ${A}
+	unpack ${A} && cd "${S}"
 
 	for i in `grep -lr "usr/local" "${S}"` ; do
 		sed -e "s:/usr/local:/usr:" -i "${i}" || die "sed failed"