[gentoo-commits] proj/kde:master commit in: kde-misc/onelinecalc/, kde-misc/onelinecalc/files/

[gentoo-commits] proj/kde:master commit in: kde-misc/onelinecalc/, kde-misc/onelinecalc/files/

[Michael Palimaka]

commit:     bcfd7984ce519e9d23ff33da5afb0ba5047ba7e5
Author:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Thu Apr 12 17:37:18 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Thu Apr 12 17:37:18 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bcfd7984

[kde-misc/onelinecalc] Version bump, remove old.

(Portage version: 2.1.10.56/git/Linux x86_64, unsigned Manifest commit)

---
 .../onelinecalc/files/cmake_fix_for_kde-4_2.patch  |   16 ----------------
 ...elinecalc-0.2.ebuild => onelinecalc-0.3.ebuild} |    6 ++++--
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/kde-misc/onelinecalc/files/cmake_fix_for_kde-4_2.patch b/kde-misc/onelinecalc/files/cmake_fix_for_kde-4_2.patch
deleted file mode 100644
index 7983810..0000000
--- a/kde-misc/onelinecalc/files/cmake_fix_for_kde-4_2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- onelinecalc-0.2.original/CMakeLists.txt
-+++ onelinecalc-0.2/CMakeLists.txt
-@@ -4,8 +4,12 @@
- # Find the required Libaries
- find_package(KDE4 REQUIRED)
- include(KDE4Defaults)
--find_package(Plasma REQUIRED)
-  
-+if ( ${KDE_VERSION} VERSION_LESS "4.1.90" )
-+else ( ${KDE_VERSION} VERSION_LESS "4.1.90" )
-+set( PLASMA_LIBS ${KDE4_PLASMA_LIBS} )
-+endif ( ${KDE_VERSION} VERSION_LESS "4.1.90" )
-+
- add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
- include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} )
-  

diff --git a/kde-misc/onelinecalc/onelinecalc-0.2.ebuild b/kde-misc/onelinecalc/onelinecalc-0.3.ebuild
similarity index 77%
rename from kde-misc/onelinecalc/onelinecalc-0.2.ebuild
rename to kde-misc/onelinecalc/onelinecalc-0.3.ebuild
index 7632713..cc2b05e 100644
--- a/kde-misc/onelinecalc/onelinecalc-0.2.ebuild
+++ b/kde-misc/onelinecalc/onelinecalc-0.3.ebuild
@@ -6,9 +6,11 @@ EAPI=4
 
 inherit kde4-base
 
+MY_PN="onlinecalc"
+
 DESCRIPTION="KDE4 plasmoid. Calculator consisting of a one line edit widget"
 HOMEPAGE="http://www.kde-look.org/content/show.php/One-Line+Calculator?content=89524"
-SRC_URI="http://www.kde-look.org/CONTENT/content-files/89524-${P}.tar.gz"
+SRC_URI="http://www.kde-look.org/CONTENT/content-files/89524-${MY_PN}-${PV}.tar.gz"
 
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~x86"
@@ -20,4 +22,4 @@ RDEPEND="
 	$(add_kdebase_dep plasma-workspace)
 "
 
-PATCHES=( "${FILESDIR}/cmake_fix_for_kde-4_2.patch" )
+S=${WORKDIR}/${MY_PN}