Version bump, drop old.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 123 insertions, 38 deletions

diff --git a/kde-misc/yawp/ChangeLog b/kde-misc/yawp/ChangeLog
index 6e3734714219..fcbcb0f21a9d 100644
--- a/kde-misc/yawp/ChangeLog
+++ b/kde-misc/yawp/ChangeLog
@@ -1,6 +1,13 @@
 # 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.3 2010/06/03 15:17:39 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/yawp/ChangeLog,v 1.4 2010/08/13 17:47:04 spatz Exp $
+
+*yawp-0.3.4 (13 Aug 2010)
+
+  13 Aug 2010; Dror Levin <spatz@gentoo.org> -yawp-0.3.2.ebuild,
+  -files/yawp-0.3.2-gcc45.patch, +yawp-0.3.4.ebuild,
+  +files/yawp-0.3.4-kde45.patch:
+  Version bump, drop old.
 
   03 Jun 2010; Dror Levin <spatz@gentoo.org> yawp-0.3.2.ebuild,
   +files/yawp-0.3.2-gcc45.patch:
diff --git a/kde-misc/yawp/files/yawp-0.3.2-gcc45.patch b/kde-misc/yawp/files/yawp-0.3.2-gcc45.patch
deleted file mode 100644
index a45ad7b42967..000000000000
--- a/kde-misc/yawp/files/yawp-0.3.2-gcc45.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: yawp-0.3.2/applet/countrymap.cpp
-===================================================================
---- yawp-0.3.2.orig/applet/countrymap.cpp
-+++ yawp-0.3.2/applet/countrymap.cpp
-@@ -47,7 +47,7 @@ QPointer<UsStatesMap>   UsStatesMap::m_p
- const QString CountryMap::sFlagTemplate("l10n/%1/flag.png");
- 
- 
--CountryMap::CountryMap *
-+CountryMap *
- CountryMap::instance()
- {
- 	QMutexLocker locker( &singeltonMutex );
-@@ -210,7 +210,7 @@ CountryMap::private_getPixmapForCountryC
- 
- /******************************************************************************/
- 
--UsStatesMap::UsStatesMap *
-+UsStatesMap *
- UsStatesMap::instance()
- {
- 	QMutexLocker locker( &singeltonMutex );
-Index: yawp-0.3.2/applet/ionlistmodel.cpp
-===================================================================
---- yawp-0.3.2.orig/applet/ionlistmodel.cpp
-+++ yawp-0.3.2/applet/ionlistmodel.cpp
-@@ -45,7 +45,7 @@ IonListModel::init( QObject * parent, co
- 	return bReturnVal;
- }
- 
--IonListModel::IonListModel *
-+IonListModel *
- IonListModel::instance()
- {
- 	QMutexLocker locker( &m_singeltonMutex );
diff --git a/kde-misc/yawp/files/yawp-0.3.4-kde45.patch b/kde-misc/yawp/files/yawp-0.3.4-kde45.patch
new file mode 100644
index 000000000000..0fd02eb76817
--- /dev/null
+++ b/kde-misc/yawp/files/yawp-0.3.4-kde45.patch
@@ -0,0 +1,113 @@
+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.2.ebuild b/kde-misc/yawp/yawp-0.3.4.ebuild
index 81a292d71236..4d2bb2bcb606 100644
--- a/kde-misc/yawp/yawp-0.3.2.ebuild
+++ b/kde-misc/yawp/yawp-0.3.4.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.2 2010/06/03 15:17:39 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/yawp/yawp-0.3.4.ebuild,v 1.1 2010/08/13 17:47:04 spatz Exp $
 
 EAPI=2
 KDE_LINGUAS="af cs de es fr he it pl ru sk sl"
@@ -18,7 +18,7 @@ IUSE="debug"
 RDEPEND=">=kde-base/plasma-workspace-${KDE_MINIMAL}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-gcc45.patch"
+	"${FILESDIR}/${P}-kde45.patch"
 )
 
 DOCS="README TODO"