[gentoo-commits] proj/kde:master commit in: kde-base/ksnapshot/files/, kde-base/ksnapshot/

[gentoo-commits] proj/kde:master commit in: kde-base/ksnapshot/files/, kde-base/ksnapshot/

[Jorge Manuel B. S. Vicetto]

commit:     b3c6df02550a3e35e5fcc94d486f9ee53a23e0d0
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  2 19:07:06 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Apr  2 19:07:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b3c6df02

Applied upstream patch to fix the handbook installation dir.

---
 .../files/ksnapshot-4.6.2-fix-handbook.patch       |   18 ++++++++++++++++++
 kde-base/ksnapshot/ksnapshot-4.6.2.ebuild          |    3 +++
 2 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/kde-base/ksnapshot/files/ksnapshot-4.6.2-fix-handbook.patch b/kde-base/ksnapshot/files/ksnapshot-4.6.2-fix-handbook.patch
new file mode 100644
index 0000000..8abc149
--- /dev/null
+++ b/kde-base/ksnapshot/files/ksnapshot-4.6.2-fix-handbook.patch
@@ -0,0 +1,18 @@
+From: Albert Astals Cid <aacid@kde.org>
+Date: Thu, 10 Mar 2011 23:15:56 +0000
+Subject: install in the correct dir
+X-Git-Url: http://quickgit.kde.org/?p=ksnapshot.git&amp;a=commitdiff&amp;h=4a0ba1374217bad1d4ffbb470e178da714da9e9a
+---
+install in the correct dir
+---
+
+
+--- ksnapshot/doc/CMakeLists.txt
++++ ksnapshot/doc/CMakeLists.txt
+@@ -1,4 +1,4 @@
+ ########### install files ###############
+ #
+ #
+-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
++kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR ksnapshot)
+

diff --git a/kde-base/ksnapshot/ksnapshot-4.6.2.ebuild b/kde-base/ksnapshot/ksnapshot-4.6.2.ebuild
index 6c1212e..00bf285 100644
--- a/kde-base/ksnapshot/ksnapshot-4.6.2.ebuild
+++ b/kde-base/ksnapshot/ksnapshot-4.6.2.ebuild
@@ -17,6 +17,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+# Fix for the install dir of the handbook
+PATCHES=( "${FILESDIR}/${P}-fix-handbook.patch" )
+
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with kipi)

[gentoo-commits] proj/kde:master commit in: kde-base/ksnapshot/files/, kde-base/ksnapshot/

[Andreas K. Huettel]

commit:     cb843017eba80896c514b34baa466cd47e09d1eb
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Mon Apr  4 21:48:58 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 21:48:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cb843017

[kde-base/ksnapshot] Patch now in tarball

(Portage version: 2.1.9.45/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 .../files/ksnapshot-4.6.2-fix-handbook.patch       |   18 ------------------
 kde-base/ksnapshot/ksnapshot-4.6.2.ebuild          |    3 ---
 2 files changed, 0 insertions(+), 21 deletions(-)

diff --git a/kde-base/ksnapshot/files/ksnapshot-4.6.2-fix-handbook.patch b/kde-base/ksnapshot/files/ksnapshot-4.6.2-fix-handbook.patch
deleted file mode 100644
index 8abc149..0000000
--- a/kde-base/ksnapshot/files/ksnapshot-4.6.2-fix-handbook.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Albert Astals Cid <aacid@kde.org>
-Date: Thu, 10 Mar 2011 23:15:56 +0000
-Subject: install in the correct dir
-X-Git-Url: http://quickgit.kde.org/?p=ksnapshot.git&amp;a=commitdiff&amp;h=4a0ba1374217bad1d4ffbb470e178da714da9e9a
----
-install in the correct dir
----
-
-
---- ksnapshot/doc/CMakeLists.txt
-+++ ksnapshot/doc/CMakeLists.txt
-@@ -1,4 +1,4 @@
- ########### install files ###############
- #
- #
--kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
-+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR ksnapshot)
-

diff --git a/kde-base/ksnapshot/ksnapshot-4.6.2.ebuild b/kde-base/ksnapshot/ksnapshot-4.6.2.ebuild
index 00bf285..6c1212e 100644
--- a/kde-base/ksnapshot/ksnapshot-4.6.2.ebuild
+++ b/kde-base/ksnapshot/ksnapshot-4.6.2.ebuild
@@ -17,9 +17,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-# Fix for the install dir of the handbook
-PATCHES=( "${FILESDIR}/${P}-fix-handbook.patch" )
-
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with kipi)

[gentoo-commits] proj/kde:master commit in: kde-base/ksnapshot/files/, kde-base/ksnapshot/

[Andreas K. Huettel]

commit:     9d950790017f9cb8307757114c45a72eb3e665e5
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Apr 10 20:09:12 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 20:09:12 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9d950790

Add patch to honor kipi useflag, bug 362531

(Portage version: 2.1.9.45/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 .../ksnapshot/files/ksnapshot-4.6.2-kipi.patch     |   20 ++++++++++++++++++++
 kde-base/ksnapshot/ksnapshot-4.6.9999.ebuild       |    2 ++
 kde-base/ksnapshot/ksnapshot-9999.ebuild           |    2 ++
 3 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/kde-base/ksnapshot/files/ksnapshot-4.6.2-kipi.patch b/kde-base/ksnapshot/files/ksnapshot-4.6.2-kipi.patch
new file mode 100644
index 0000000..02bc2fc
--- /dev/null
+++ b/kde-base/ksnapshot/files/ksnapshot-4.6.2-kipi.patch
@@ -0,0 +1,20 @@
+diff -ruN ksnapshot-4.6.2.orig/ksnapshot/CMakeLists.txt ksnapshot-4.6.2/ksnapshot/CMakeLists.txt
+--- ksnapshot-4.6.2.orig/ksnapshot/CMakeLists.txt	2011-04-01 21:38:15.000000000 +0200
++++ ksnapshot-4.6.2/ksnapshot/CMakeLists.txt	2011-04-10 22:02:39.035066966 +0200
+@@ -1,7 +1,7 @@
+ project(ksnapshot)
+ 
+ find_package(KDE4 REQUIRED)
+-find_package(Kipi)
++
+ include(KDE4Defaults)
+ include(MacroLibrary)
+ include(MacroOptionalAddSubdirectory)
+@@ -17,7 +17,6 @@
+ if (KIPI_FOUND)
+         include_directories(${KIPI_INCLUDE_DIR})
+ endif (KIPI_FOUND)
+-macro_log_feature(KIPI_FOUND "KIPI plugins" "KIPI plugins to export, print, etc" "http://www.kipi-plugins.org/" FALSE "" "Neeed to print, send by e-mail, export to Facebook, Picasa, etc")
+ 
+ configure_file(config-ksnapshot.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksnapshot.h)
+ 

diff --git a/kde-base/ksnapshot/ksnapshot-4.6.9999.ebuild b/kde-base/ksnapshot/ksnapshot-4.6.9999.ebuild
index ed7f183..a923000 100644
--- a/kde-base/ksnapshot/ksnapshot-4.6.9999.ebuild
+++ b/kde-base/ksnapshot/ksnapshot-4.6.9999.ebuild
@@ -17,6 +17,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-4.6.2-kipi.patch" )
+
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with kipi)

diff --git a/kde-base/ksnapshot/ksnapshot-9999.ebuild b/kde-base/ksnapshot/ksnapshot-9999.ebuild
index 8207079..3898641 100644
--- a/kde-base/ksnapshot/ksnapshot-9999.ebuild
+++ b/kde-base/ksnapshot/ksnapshot-9999.ebuild
@@ -23,6 +23,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-4.6.2-kipi.patch" )
+
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with kipi)

[gentoo-commits] proj/kde:master commit in: kde-base/ksnapshot/files/, kde-base/ksnapshot/

[Jonathan Callen]

commit:     259bc55d42c2ef64b93d1c561665c95e15083079
Author:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 07:45:57 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 07:45:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=259bc55d

[kde-base/ksnapshot] Update patch for current git

---
 kde-base/ksnapshot/files/ksnapshot-4.7-kipi.patch |   19 +++++++++++++++++++
 kde-base/ksnapshot/ksnapshot-9999.ebuild          |    2 +-
 2 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/kde-base/ksnapshot/files/ksnapshot-4.7-kipi.patch b/kde-base/ksnapshot/files/ksnapshot-4.7-kipi.patch
new file mode 100644
index 0000000..43044fe
--- /dev/null
+++ b/kde-base/ksnapshot/files/ksnapshot-4.7-kipi.patch
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 683c270..25be4b5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,11 +1,13 @@
+ project(ksnapshot)
+ 
+ find_package(KDE4 REQUIRED)
+-find_package(Kipi)
+ include(KDE4Defaults)
+ include(MacroLibrary)
+ include(MacroOptionalAddSubdirectory)
+ include(MacroBoolTo01)
++include(MacroOptionalFindPackage)
++
++macro_optional_find_package(Kipi)
+ 
+ add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS})
+ include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})

diff --git a/kde-base/ksnapshot/ksnapshot-9999.ebuild b/kde-base/ksnapshot/ksnapshot-9999.ebuild
index db0ff8b..4fd19ec 100644
--- a/kde-base/ksnapshot/ksnapshot-9999.ebuild
+++ b/kde-base/ksnapshot/ksnapshot-9999.ebuild
@@ -23,7 +23,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-4.6.2-kipi.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.7-kipi.patch" )
 
 src_configure() {
 	mycmakeargs=(

[gentoo-commits] proj/kde:master commit in: kde-base/ksnapshot/files/, kde-base/ksnapshot/

[Michael Palimaka]

commit:     798ff98cc726ea34153c2d3ced8b1566507b71a3
Author:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Thu Apr 19 18:26:58 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Thu Apr 19 18:26:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=798ff98c

[kde-base/ksnapshot] Remove patch merged upstream.

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

---
 kde-base/ksnapshot/files/ksnapshot-4.7-kipi.patch |   19 -------------------
 kde-base/ksnapshot/ksnapshot-4.8.49.9999.ebuild   |    2 --
 kde-base/ksnapshot/ksnapshot-9999.ebuild          |    2 --
 3 files changed, 0 insertions(+), 23 deletions(-)

diff --git a/kde-base/ksnapshot/files/ksnapshot-4.7-kipi.patch b/kde-base/ksnapshot/files/ksnapshot-4.7-kipi.patch
deleted file mode 100644
index 43044fe..0000000
--- a/kde-base/ksnapshot/files/ksnapshot-4.7-kipi.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 683c270..25be4b5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,11 +1,13 @@
- project(ksnapshot)
- 
- find_package(KDE4 REQUIRED)
--find_package(Kipi)
- include(KDE4Defaults)
- include(MacroLibrary)
- include(MacroOptionalAddSubdirectory)
- include(MacroBoolTo01)
-+include(MacroOptionalFindPackage)
-+
-+macro_optional_find_package(Kipi)
- 
- add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS})
- include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})

diff --git a/kde-base/ksnapshot/ksnapshot-4.8.49.9999.ebuild b/kde-base/ksnapshot/ksnapshot-4.8.49.9999.ebuild
index 7696132..3c75e1b 100644
--- a/kde-base/ksnapshot/ksnapshot-4.8.49.9999.ebuild
+++ b/kde-base/ksnapshot/ksnapshot-4.8.49.9999.ebuild
@@ -17,8 +17,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-4.7-kipi.patch" )
-
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with kipi)

diff --git a/kde-base/ksnapshot/ksnapshot-9999.ebuild b/kde-base/ksnapshot/ksnapshot-9999.ebuild
index 7696132..3c75e1b 100644
--- a/kde-base/ksnapshot/ksnapshot-9999.ebuild
+++ b/kde-base/ksnapshot/ksnapshot-9999.ebuild
@@ -17,8 +17,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-4.7-kipi.patch" )
-
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with kipi)