Version bump. Drop older.

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

4 files changed, 13 insertions, 139 deletions

diff --git a/kde-misc/yawp/ChangeLog b/kde-misc/yawp/ChangeLog
index fcbcb0f21a9d..74345990533c 100644
--- a/kde-misc/yawp/ChangeLog
+++ b/kde-misc/yawp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-misc/yawp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/yawp/ChangeLog,v 1.4 2010/08/13 17:47:04 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/yawp/ChangeLog,v 1.5 2010/10/09 18:48:13 scarabeus Exp $
+
+*yawp-0.3.5 (09 Oct 2010)
+
+  09 Oct 2010; Tomáš Chvátal <scarabeus@gentoo.org> -yawp-0.3.4.ebuild,
+  -files/yawp-0.3.4-kde45.patch, +yawp-0.3.5.ebuild:
+  Version bump. Drop older.
 
 *yawp-0.3.4 (13 Aug 2010)
 
diff --git a/kde-misc/yawp/Manifest b/kde-misc/yawp/Manifest
index 4d1e995b32fb..d583d505a607 100644
--- a/kde-misc/yawp/Manifest
+++ b/kde-misc/yawp/Manifest
@@ -1,19 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX yawp-0.3.4-kde45.patch 5031 RMD160 1cb9da758013d54553c4fc2ada836d206ccc2597 SHA1 4682527ebf847c4223fba15284519dc4bb2f8689 SHA256 41b842456b11650868742e6e82d08c3fff07220f0f0ea3eb099307b070d09b3e
-DIST yawp-0.3.4.tar.bz2 1077094 RMD160 29e29b350d08a1017959487d833bf69bb1dac405 SHA1 6afa20a8dbe50fdce7f5aa833ef6ff856422a05c SHA256 8ecd01772e596b5677db06fb63790209ea14bc003d18a64dcaeb48c64e9167c8
-EBUILD yawp-0.3.4.ebuild 625 RMD160 08a7dec77b7e600cc22ba4cbc196a26ea419a8ed SHA1 b04c3d76da8c5cca16aa904d7615742045d0064d SHA256 a613728c3b59afc2ad479450fd08c58b614d9a7044e30eddc31c04326557a64e
-MISC ChangeLog 893 RMD160 68cc164e80339fe86091b54a678437075ad86154 SHA1 0a723e6c4a4ad7c3a95fa1c5b423b6e66835d31b SHA256 ec3e55cf923ee1e42c11774d29eeaa25e4674f7461af0ba7c23eda2687dcd94f
+DIST yawp-0.3.5.tar.bz2 1078296 RMD160 ca145fbda645b6edfc65dc38316c19690818cc7b SHA1 1c4be41bf07e5eb8109958470c10d24aa4dfdcbc SHA256 fd8069dd3a391f9dd4eb4f0c53551b64a905c61450d654bde06a59e673607b3f
+EBUILD yawp-0.3.5.ebuild 587 RMD160 a877989e4e145118b9b144e72bfe71a956f5620d SHA1 d83f66df06c8debaf21f6243aa068d459b1f4d29 SHA256 7a2682df18abbb6c4977fb0c883de3bdd5d2cc59a097167bd57305b2d74713cc
+MISC ChangeLog 1081 RMD160 2fb1918a6f596fe59a0012a4a360f5688783a17a SHA1 0da37e0f5a2826ead5f66df6034573c1b351db2f SHA256 0bce9dbc27bea9ce6f3ea484f410f3118894bdadc73b86b07c8c7115fbc1c629
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQEcBAEBCgAGBQJMZYUhAAoJEAWF714uGAc6EcoH/iRVr1pbw2FaPqPXzx6w7np0
-2xlQ+MYNXhos37AJUj9sIaKPUT+5qvhESqmDHRP2/3RmpMUa4IFzlFLPhm5KojQY
-EFnB0rDCfivuzRTKp6U+5S8sbQIuVkJwXqnge/QWovX5tHuzRAuJ8vgrgsoIfP+A
-yuUAfHdR5HTEnI9/wKaMpIwJJiKdvz7CxC8Ky9buMFMQZcpoBhlUTnfGbHFAOKAV
-IyJ9AFkFkrPBUoIsYbORMJl09u9JoYHLeDpnl2M9ASdvTNJj/6vWygUbLO+LbIOU
-8TcqFj4EiwVp3ZDjDaeGdJBgt/Vl0rXVIx52jsi4SmrAHXM5i3xnu4tdk4h+nII=
-=icr4
------END PGP SIGNATURE-----
diff --git a/kde-misc/yawp/files/yawp-0.3.4-kde45.patch b/kde-misc/yawp/files/yawp-0.3.4-kde45.patch
deleted file mode 100644
index 0fd02eb76817..000000000000
--- a/kde-misc/yawp/files/yawp-0.3.4-kde45.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff -ur yawp-0.3.4-old/applet/configdialog/yawpconfig.cpp yawp-0.3.4/applet/configdialog/yawpconfig.cpp
---- yawp-0.3.4-old/applet/configdialog/yawpconfig.cpp	2010-07-07 21:42:28.000000000 +0300
-+++ yawp-0.3.4/applet/configdialog/yawpconfig.cpp	2010-08-13 20:33:19.827560364 +0300
-@@ -135,7 +135,7 @@
- 	connect(checkBoxUseCustomColor,		SIGNAL(stateChanged(int)),	this,  SLOT(enableCustomFontColorOptions(int)));
- 
- 	//--- SETUP UNIT SYSTEM ---
--#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR == 4
-+#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR >= 4
- 	comboTemperature->insertItem( 0, i18n("Celsius"),	QVariant(KUnitConversion::Celsius) );
- 	comboTemperature->insertItem( 1, i18n("Fahrenheit"),	QVariant(KUnitConversion::Fahrenheit) );
- 
-Only in yawp-0.3.4/applet/configdialog: yawpconfig.cppr
-diff -ur yawp-0.3.4-old/applet/utils.h yawp-0.3.4/applet/utils.h
---- yawp-0.3.4-old/applet/utils.h	2010-07-07 21:42:28.000000000 +0300
-+++ yawp-0.3.4/applet/utils.h	2010-08-13 20:33:19.824560364 +0300
-@@ -53,7 +53,7 @@
- 	inline QString
- 	GetUnitString( int unit )
- 	{
--#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR == 4
-+#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR >= 4
- 		KUnitConversion::Value v(1.0, unit);
- 		QString str = v.unit()->symbol();
- #else
-@@ -62,7 +62,7 @@
- /*		switch( unit )
- 		{
- 		e.g.:
--#if KDE_VERSION_MINOR == 4
-+#if KDE_VERSION_MINOR >= 4
- 			case KUnitConversion::Meter:	str = i18n("m"); break;
- #else if KDE_VERSION_MINOR == 3
- 
-Only in yawp-0.3.4/applet: utils.hr
-diff -ur yawp-0.3.4-old/applet/weatherdataprocessor.cpp yawp-0.3.4/applet/weatherdataprocessor.cpp
---- yawp-0.3.4-old/applet/weatherdataprocessor.cpp	2010-07-07 21:42:28.000000000 +0300
-+++ yawp-0.3.4/applet/weatherdataprocessor.cpp	2010-08-13 20:33:19.826560364 +0300
-@@ -643,7 +643,7 @@
- 
- 	if( fromSystem != distanceSystem )
- 	{
--#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR == 4
-+#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR >= 4
- 		KUnitConversion::Value v( (double) fValue, fromSystem);
- 		fValue = v.convertTo(distanceSystem).number();
- #elif KDE_VERSION_MINOR == 3
-@@ -664,7 +664,7 @@
- 		return SHRT_MAX;
- 	if( fromSystem != pressureSystem )
- 	{
--#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR == 4
-+#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR >= 4
- 		KUnitConversion::Value v( (double) fValue, fromSystem);
- 		fValue = v.convertTo(pressureSystem).number();
- #elif KDE_VERSION_MINOR >= 3
-@@ -687,7 +687,7 @@
- 
- 	if( fromSystem != temperatureSystem )
- 	{
--#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR == 4
-+#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR >= 4
- 		KUnitConversion::Value v( (double) fValue, fromSystem);
- 		fValue = v.convertTo(temperatureSystem).number();
- #elif KDE_VERSION_MINOR >= 3
-@@ -709,7 +709,7 @@
- 
- 	if( fromSystem != speedSystem )
- 	{
--#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR == 4
-+#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR >= 4
- 		KUnitConversion::Value v( (double) fValue, fromSystem);
- 		fValue = v.convertTo(speedSystem).number();
- #elif KDE_VERSION_MINOR >= 3
-Only in yawp-0.3.4/applet: weatherdataprocessor.cppr
-diff -ur yawp-0.3.4-old/ions/ion_google.h yawp-0.3.4/ions/ion_google.h
---- yawp-0.3.4-old/ions/ion_google.h	2010-07-07 21:42:28.000000000 +0300
-+++ yawp-0.3.4/ions/ion_google.h	2010-08-13 20:32:40.514560372 +0300
-@@ -22,7 +22,7 @@
- #define ION_GOOGLE_H
- 
- //--- LOCAL ---
--#include <units.h>
-+#include "units.h"
- 
- //--- QT4 ---
- #include <QDate>
-diff -ur yawp-0.3.4-old/ions/ion_wunderground.cpp yawp-0.3.4/ions/ion_wunderground.cpp
---- yawp-0.3.4-old/ions/ion_wunderground.cpp	2010-07-07 21:42:28.000000000 +0300
-+++ yawp-0.3.4/ions/ion_wunderground.cpp	2010-08-13 20:33:19.824560364 +0300
-@@ -782,7 +782,7 @@
- 	}
- 
- 	int iTempSystem(0), iSpeedSystem(0), iDistanceSystem(0), iPressureSystem(0);
--#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR == 4
-+#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR >= 4
- 	if( data.measureSystem == KLocale::Metric )
- 	{
- 		iTempSystem = KUnitConversion::Celsius;
-Only in yawp-0.3.4/ions: ion_wunderground.cppr
-diff -ur yawp-0.3.4-old/ions/units.h yawp-0.3.4/ions/units.h
---- yawp-0.3.4-old/ions/units.h	2010-07-07 21:42:28.000000000 +0300
-+++ yawp-0.3.4/ions/units.h	2010-08-13 20:33:19.828560364 +0300
-@@ -26,7 +26,7 @@
- 
- 
- //#if KDE_IS_VERSION(4,3,70)
--#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR == 4
-+#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR >= 4
- 	#include <KUnitConversion/Converter>
- 	#define FAHRENHEIT KUnitConversion::Fahrenheit
- 	#define CELSIUS KUnitConversion::Celsius
-Only in yawp-0.3.4/ions: units.hr
diff --git a/kde-misc/yawp/yawp-0.3.4.ebuild b/kde-misc/yawp/yawp-0.3.5.ebuild
index 4d2bb2bcb606..3e15c79505e6 100644
--- a/kde-misc/yawp/yawp-0.3.4.ebuild
+++ b/kde-misc/yawp/yawp-0.3.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/yawp/yawp-0.3.4.ebuild,v 1.1 2010/08/13 17:47:04 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/yawp/yawp-0.3.5.ebuild,v 1.1 2010/10/09 18:48:13 scarabeus Exp $
 
-EAPI=2
-KDE_LINGUAS="af cs de es fr he it pl ru sk sl"
+EAPI=3
+KDE_LINGUAS="af cs de es fr he it pl ru sk sl uk"
 inherit kde4-base
 
 DESCRIPTION="Yet Another Weather Plasmoid"
@@ -17,8 +17,4 @@ IUSE="debug"
 
 RDEPEND=">=kde-base/plasma-workspace-${KDE_MINIMAL}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-kde45.patch"
-)
-
 DOCS="README TODO"