Version bump, drop old.

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

5 files changed, 135 insertions, 50 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/Manifest b/kde-misc/yawp/Manifest
index 3c6e48fbd66e..4d1e995b32fb 100644
--- a/kde-misc/yawp/Manifest
+++ b/kde-misc/yawp/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX yawp-0.3.2-gcc45.patch 1078 RMD160 15ea7d40caa4a05bbd3bafab2769e3cdf0854ace SHA1 8aa4f23b9b536fde38a2bfc95332fab1962ce98f SHA256 cbfb2931506087c44cc686f577140b788863d5c9efd27ff757d4abb1aacb8e20
-DIST yawp-0.3.2.tar.bz2 982100 RMD160 03f46a230ed732c9b3522c9467141bf188772161 SHA1 cd9c556f87dc7ec544c6dab8ece95afd7d3865cd SHA256 d311f3871258118de7d5032de895d5e11c9d42e1f18fc256bfac1fdbbb5b8daa
-EBUILD yawp-0.3.2.ebuild 625 RMD160 abe71c2dfd06679fa00040575aaa3a1181083a91 SHA1 5a0adfb45c5af164869e91682a26cc20309ea674 SHA256 5b3863b5b35566861031d0943974a66ea44f5815e753c6fa184219f49dd26353
-MISC ChangeLog 688 RMD160 c08479b3defdf0ca3f72f4e456d44a75ca5eaa81 SHA1 5b603a288d0aa6bd7f02d89d7d27f44a8c86c018 SHA256 2ee86418a56287e84d2bb5de585fd5634721bb96ed8d78d7b084c9c815263b6d
+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
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEbBAEBCgAGBQJMB8ecAAoJEAWF714uGAc6Yy4H+O4w3JmZMRpM5DLs4sgKw+xz
-Y8aTktCy0a4MQdJAURSVIVw0en/j5y/q+tRHUEN1egRJsFj1cFQCIhRqOuj1ClPI
-hU5DtvVzkCrVv1teDbjgUXNptEe6djqSbKnd8dyWyeimhp5nzDwWFJ/htUttWhVX
-NZgy7XLiELKb3E4cS6I6O5DsWvi12Sm5eLckHFpEVUSBUYvuqjeKArexJ+tsg4kq
-QU/Bg19LJWGQQYnXPZrGIkvYwAztDHSCOFp8oneHx8Yk0B2g5x1YrklaHqisDpZe
-tLL8rqmOcjlQPTXHx++fRv9o+9SPywdlGxEV/hc1/dclpujcrBYsND8KGbSuxw==
-=oRle
+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.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"