[gentoo-commits] proj/kde:master commit in: app-text/kbibtex/files/, app-text/kbibtex/

2017-10-28 Thread Andreas Sturmlechner
commit: c79cd9c641ed44f48b63f1727ad7ee7c05fa4da2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Oct 27 21:48:14 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 28 09:10:33 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c79cd9c6

app-text/kbibtex: Drop obsolete patch

Package-Manager: Portage-2.3.12, Repoman-2.3.4

 .../kbibtex/files/kbibtex-system-qtoauth.patch | 115 -
 app-text/kbibtex/kbibtex-.ebuild   |   8 --
 2 files changed, 123 deletions(-)

diff --git a/app-text/kbibtex/files/kbibtex-system-qtoauth.patch 
b/app-text/kbibtex/files/kbibtex-system-qtoauth.patch
deleted file mode 100644
index b582273743..00
--- a/app-text/kbibtex/files/kbibtex-system-qtoauth.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-commit d5742d770702b60f375139abb4df6f550682dbe8
-Author: Andreas Sturmlechner 
-Date:   Sun Jan 24 13:04:26 2016 +0100
-
-Re-enable system QtOAuth
-
-This reverts commit ff4b966f13b1b8da8471f92f44751b58012a53e8 and
-partially reverts commit 7b6937326ba2a4e4072692add38a4abd28bd0cd4
-so that kbibtex is using system-qoauth instead of bundled one.
-
-REVIEW: 129927
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fc73a28c..f5db0bb2 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -165,6 +165,26 @@ endif(
- )
- 
- find_package(
-+QtOAuth
-+)
-+if(
-+QTOAUTH_FOUND
-+)
-+add_definitions(
-+-DHAVE_QTOAUTH
-+)
-+else(
-+QTOAUTH_FOUND
-+)
-+message(
-+STATUS
-+"No QtOAuth installed, disabling Zotero OAuth wizard"
-+)
-+endif(
-+QTOAUTH_FOUND
-+)
-+
-+find_package(
- Qca-qt5 "2.1.0"
- )
- if (Qca-qt5_FOUND)
-diff --git a/src/networking/CMakeLists.txt b/src/networking/CMakeLists.txt
-index bd16f61e..2e3c4d58 100644
 a/src/networking/CMakeLists.txt
-+++ b/src/networking/CMakeLists.txt
-@@ -40,12 +40,23 @@ if(BUILD_ZOTERO)
- zotero/collection.cpp
- zotero/items.cpp
- zotero/groups.cpp
--zotero/oauthwizard.cpp
- zotero/tags.cpp
- zotero/tagmodel.cpp
--# QOAuth for Qt5 from Git
--../3rdparty/qoauth/src/interface.cpp
-+)
-+if(
-+QTOAUTH_FOUND
-+)
-+include_directories(
-+${QTOAUTH_INCLUDE_DIR}
-+)
-+list(
-+APPEND
-+kbibtexnetworking_LIB_SRCS
-+zotero/oauthwizard.cpp
- )
-+endif(
-+QTOAUTH_FOUND
-+)
- endif(BUILD_ZOTERO)
- 
- set(
-@@ -90,7 +101,6 @@ if(UNITY_BUILD)
- endif(UNITY_BUILD)
- 
- include_directories(
--${CMAKE_SOURCE_DIR}/src/3rdparty/qoauth/include
- ${CMAKE_BINARY_DIR}/src/config
- ${CMAKE_SOURCE_DIR}/src/config
- ${CMAKE_BINARY_DIR}/src/data
-@@ -132,9 +142,18 @@ if(BUILD_ZOTERO)
- kbibtexnetworking
- qca-qt5
- )
-+if(
-+QTOAUTH_FOUND
-+)
-+target_link_libraries(
-+kbibtexnetworking
-+${QTOAUTH_LIBRARY}
-+)
-+endif(
-+QTOAUTH_FOUND
-+)
- endif(BUILD_ZOTERO)
- 
--
- set_target_properties(
- kbibtexnetworking
- PROPERTIES
-diff --git a/src/networking/zotero/oauthwizard.cpp 
b/src/networking/zotero/oauthwizard.cpp
-index aca03049..7d97886c 100644
 a/src/networking/zotero/oauthwizard.cpp
-+++ b/src/networking/zotero/oauthwizard.cpp
-@@ -35,7 +35,7 @@
- #include "internalnetworkaccessmanager.h"
- #include "logging_networking.h"
- 
--#include 
-+#include 
- 
- using namespace Zotero;
- 

diff --git a/app-text/kbibtex/kbibtex-.ebuild 
b/app-text/kbibtex/kbibtex-.ebuild
index 2fda117464..f48ea59a2b 100644
--- a/app-text/kbibtex/kbibtex-.ebuild
+++ b/app-text/kbibtex/kbibtex-.ebuild
@@ -60,14 +60,6 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${P/_/-}"
 
-PATCHES=( "${FILESDIR}/${PN}-system-qtoauth.patch" )
-
-src_prepare() {
-   kde5_src_prepare
-
-   rm -r src/3rdparty/qoauth || die "Failed to remove bundled qoauth"
-}
-
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)



[gentoo-commits] proj/kde:master commit in: app-text/kbibtex/files/, app-text/kbibtex/

2017-06-11 Thread Andreas Sturmlechner
commit: e7d827be7d5bc5a56e97de418d1211afb64d10ef
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun 11 20:54:46 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jun 11 21:43:49 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e7d827be

app-text/kbibtex: Rebase qtoauth patches

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 .../kbibtex-part-revert-reenable-qtoauth.patch |  51 -
 .../files/kbibtex-revert-removing-qtoauth.patch| 112 
 .../kbibtex/files/kbibtex-system-qtoauth.patch | 115 +
 app-text/kbibtex/kbibtex-.ebuild   |   5 +-
 4 files changed, 116 insertions(+), 167 deletions(-)

diff --git a/app-text/kbibtex/files/kbibtex-part-revert-reenable-qtoauth.patch 
b/app-text/kbibtex/files/kbibtex-part-revert-reenable-qtoauth.patch
deleted file mode 100644
index ce095c6698..00
--- a/app-text/kbibtex/files/kbibtex-part-revert-reenable-qtoauth.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 84f84747649237afcf9bd7465ba85fafd6bbc240 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Sun, 24 Jan 2016 13:16:54 +0100
-Subject: [PATCH 2/2] Partially revert "Re-enabling code for QtOAuth"
-
-This partially reverts commit 7b6937326ba2a4e4072692add38a4abd28bd0cd4
-so that kbibtex is using system-qoauth instead of bundled one.
-
-REVIEW: 129927

- src/networking/CMakeLists.txt | 3 ---
- src/networking/zotero/oauthwizard.cpp | 2 +-
- 2 files changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/networking/CMakeLists.txt b/src/networking/CMakeLists.txt
-index 27507b3a..4f3d03bc 100644
 a/src/networking/CMakeLists.txt
-+++ b/src/networking/CMakeLists.txt
-@@ -42,8 +42,6 @@ if(NOT WIN32)
- zotero/groups.cpp
- zotero/tags.cpp
- zotero/tagmodel.cpp
--# QOAuth for Qt5 from Git
--../3rdparty/qoauth/src/interface.cpp
- )
- endif(NOT WIN32)
- 
-@@ -88,7 +86,6 @@ if(UNITY_BUILD)
- endif(UNITY_BUILD)
- 
- include_directories(
--${CMAKE_SOURCE_DIR}/src/3rdparty/qoauth/include
- ${CMAKE_BINARY_DIR}/src/config
- ${CMAKE_SOURCE_DIR}/src/config
- ${CMAKE_BINARY_DIR}/src/data
-diff --git a/src/networking/zotero/oauthwizard.cpp 
b/src/networking/zotero/oauthwizard.cpp
-index 1d9129ee..91ff23bf 100644
 a/src/networking/zotero/oauthwizard.cpp
-+++ b/src/networking/zotero/oauthwizard.cpp
-@@ -34,7 +34,7 @@
- #include "internalnetworkaccessmanager.h"
- #include "logging_networking.h"
- 
--#include 
-+#include 
- 
- using namespace Zotero;
- 
--- 
-2.12.2
-

diff --git a/app-text/kbibtex/files/kbibtex-revert-removing-qtoauth.patch 
b/app-text/kbibtex/files/kbibtex-revert-removing-qtoauth.patch
deleted file mode 100644
index 3e0195b485..00
--- a/app-text/kbibtex/files/kbibtex-revert-removing-qtoauth.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 0ecdc46fbf9cdab24be92e785ec59b2338634cb1 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Sun, 24 Jan 2016 13:04:26 +0100
-Subject: [PATCH 1/2] Revert "Removing references to QtOAuth and Qca-Qt5"
-
-This reverts commit ff4b966f13b1b8da8471f92f44751b58012a53e8.
-
-REVIEW: 129927

- CMakeLists.txt| 20 
- src/networking/CMakeLists.txt | 33 +++--
- 2 files changed, 51 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f8620185..b22b5ef8 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -152,6 +152,26 @@ endif(
- )
- 
- find_package(
-+QtOAuth
-+)
-+if(
-+QTOAUTH_FOUND
-+)
-+add_definitions(
-+-DHAVE_QTOAUTH
-+)
-+else(
-+QTOAUTH_FOUND
-+)
-+message(
-+STATUS
-+"No QtOAuth installed, disabling Zotero OAuth wizard"
-+)
-+endif(
-+QTOAUTH_FOUND
-+)
-+
-+find_package(
- Qca-qt5 "2.1.0"
- REQUIRED
- )
-diff --git a/src/networking/CMakeLists.txt b/src/networking/CMakeLists.txt
-index f99236c1..27507b3a 100644
 a/src/networking/CMakeLists.txt
-+++ b/src/networking/CMakeLists.txt
-@@ -40,7 +40,6 @@ if(NOT WIN32)
- zotero/collection.cpp
- zotero/items.cpp
- zotero/groups.cpp
--zotero/oauthwizard.cpp
- zotero/tags.cpp
- zotero/tagmodel.cpp
- # QOAuth for Qt5 from Git
-@@ -79,7 +78,6 @@ set(
- zotero/tagmodel.h
- zotero/items.h
- zotero/api.h
--zotero/oauthwizard.h
- associatedfiles.h
- findpdf.h
- internalnetworkaccessmanager.h
-@@ -102,6 +100,26 @@ include_directories(
- ${CMAKE_SOURCE_DIR}/src/global
- )
- 
-+if(
-+QTOAUTH_FOUND
-+)
-+include_directories(
-+${QTOAUTH_INCLUDE_DIR}
-+)
-+set(
-+kbibtexnetworking_HDRS
-+${kbibtexnetworking_HDRS}
-+zotero/oauthwizard.h
-+)
-+set(
-+kbibtexnetworking_LIB_SRCS
-+${kbibtexnetworking_LIB_SRCS}
-+

[gentoo-commits] proj/kde:master commit in: app-text/kbibtex/files/, app-text/kbibtex/

2016-10-23 Thread Michael Palimaka
commit: 253f3e296b05abc8a84065c115bfb3ddec9e7764
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sun Oct 23 14:23:40 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Oct 23 16:22:01 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=253f3e29

app-text/kbibtex: Drop upstreamed patch

Package-Manager: portage-2.3.0

 .../kbibtex/files/kbibtex-doctools-optional.patch  | 40 --
 app-text/kbibtex/kbibtex-.ebuild   |  2 --
 2 files changed, 42 deletions(-)

diff --git a/app-text/kbibtex/files/kbibtex-doctools-optional.patch 
b/app-text/kbibtex/files/kbibtex-doctools-optional.patch
deleted file mode 100644
index 57527b0..000
--- a/app-text/kbibtex/files/kbibtex-doctools-optional.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit d23557e8a5c4170c5d2a20cb17421e5f0b303f94
-Author: Andreas Sturmlechner 
-Date:   Sun Mar 13 12:22:09 2016 +0100
-
-Make KF5DocTools optional
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index eb33c9e..0525db1 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -61,7 +61,6 @@ find_package(
- find_package(
- KF5 ${KF5_MIN_VERSION}
- REQUIRED
--DocTools
- I18n
- XmlGui
- KIO
-@@ -74,6 +73,8 @@ find_package(
- Wallet
- )
- 
-+find_package(KF5DocTools)
-+
- # Version number for the exported headers / libs
- set(
- VERSION_BRANCH "0.8"
-@@ -182,9 +183,9 @@ add_subdirectory(
- add_subdirectory(
- xslt
- )
-+if(KF5DocTools_FOUND)
-+  add_subdirectory(doc)
-+endif()
--add_subdirectory(
--doc
--)
- add_subdirectory(
- mime
- )

diff --git a/app-text/kbibtex/kbibtex-.ebuild 
b/app-text/kbibtex/kbibtex-.ebuild
index 0cde411..fa8769e 100644
--- a/app-text/kbibtex/kbibtex-.ebuild
+++ b/app-text/kbibtex/kbibtex-.ebuild
@@ -60,8 +60,6 @@ S="${WORKDIR}/${P/_/-}"
 PATCHES=(
"${FILESDIR}/${PN}-revert-removing-qtoauth.patch"
"${FILESDIR}/${PN}-part-revert-reenable-qtoauth.patch"
-
-   "${FILESDIR}/${PN}-doctools-optional.patch" # RR pending upstream
 )
 
 src_prepare() {



[gentoo-commits] proj/kde:master commit in: app-text/kbibtex/files/, app-text/kbibtex/

2016-03-13 Thread Michael Palimaka
commit: 64667a6d7222a0cf6755e89de46933afe41cbdc8
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sun Mar 13 12:04:15 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Mar 13 12:35:09 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=64667a6d

app-text/kbibtex: Fix DEPENDs, fix USE=!handbook

Package-Manager: portage-2.2.27

 .../kbibtex/files/kbibtex-doctools-optional.patch  | 40 ++
 app-text/kbibtex/kbibtex-.ebuild   | 20 ++-
 2 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/app-text/kbibtex/files/kbibtex-doctools-optional.patch 
b/app-text/kbibtex/files/kbibtex-doctools-optional.patch
new file mode 100644
index 000..57527b0
--- /dev/null
+++ b/app-text/kbibtex/files/kbibtex-doctools-optional.patch
@@ -0,0 +1,40 @@
+commit d23557e8a5c4170c5d2a20cb17421e5f0b303f94
+Author: Andreas Sturmlechner 
+Date:   Sun Mar 13 12:22:09 2016 +0100
+
+Make KF5DocTools optional
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index eb33c9e..0525db1 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -61,7 +61,6 @@ find_package(
+ find_package(
+ KF5 ${KF5_MIN_VERSION}
+ REQUIRED
+-DocTools
+ I18n
+ XmlGui
+ KIO
+@@ -74,6 +73,8 @@ find_package(
+ Wallet
+ )
+ 
++find_package(KF5DocTools)
++
+ # Version number for the exported headers / libs
+ set(
+ VERSION_BRANCH "0.8"
+@@ -182,9 +183,9 @@ add_subdirectory(
+ add_subdirectory(
+ xslt
+ )
++if(KF5DocTools_FOUND)
++  add_subdirectory(doc)
++endif()
+-add_subdirectory(
+-doc
+-)
+ add_subdirectory(
+ mime
+ )

diff --git a/app-text/kbibtex/kbibtex-.ebuild 
b/app-text/kbibtex/kbibtex-.ebuild
index c17e823..0df48bf 100644
--- a/app-text/kbibtex/kbibtex-.ebuild
+++ b/app-text/kbibtex/kbibtex-.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_GCC_MINIMAL="4.9"
-KDE_HANDBOOK="forceoptional"
+KDE_HANDBOOK="optional"
 inherit kde5
 
 DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
@@ -33,24 +33,26 @@ DEPEND="
$(add_frameworks_dep kparts)
$(add_frameworks_dep kservice)
$(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwallet)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
-   app-text/poppler[qt5]
-   dev-libs/icu:=
-   dev-libs/libxml2
-   dev-libs/libxslt
-   dev-libs/qoauth:5
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
$(add_qt_dep qtwebkit)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
+   app-text/poppler[qt5]
+   dev-libs/icu:=
+   dev-libs/libxml2
+   dev-libs/libxslt
+   dev-libs/qoauth:5
virtual/tex-base
 "
 RDEPEND="${DEPEND}
-   dev-tex/bibtex2html
!app-text/kbibtex:4
+   dev-tex/bibtex2html
+   x11-misc/shared-mime-info
 "
 
 S=${WORKDIR}/${P/_/-}
@@ -58,6 +60,8 @@ S=${WORKDIR}/${P/_/-}
 PATCHES=(
"${FILESDIR}/${PN}-revert-removing-qtoauth.patch"
"${FILESDIR}/${PN}-part-revert-reenable-qtoauth.patch"
+
+   "${FILESDIR}/${PN}-doctools-optional.patch" # RR pending upstream
 )
 
 src_prepare() {



[gentoo-commits] proj/kde:master commit in: app-text/kbibtex/files/, app-text/kbibtex/

2015-07-27 Thread Johannes Huber
commit: 7e1fc47c90fd5e7d979f6767a0d25e85e4e0fea5
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Sun Jul 26 20:51:56 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Sun Jul 26 20:51:56 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7e1fc47c

[app-text/kbibtex] Switch to feature/kf5 branch

Package-Manager: portage-2.2.20

 app-text/kbibtex/files/kbibtex-fix-cmake.patch | 19 +
 app-text/kbibtex/kbibtex-.ebuild   | 39 +-
 2 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/app-text/kbibtex/files/kbibtex-fix-cmake.patch 
b/app-text/kbibtex/files/kbibtex-fix-cmake.patch
new file mode 100644
index 000..9fd7b41
--- /dev/null
+++ b/app-text/kbibtex/files/kbibtex-fix-cmake.patch
@@ -0,0 +1,19 @@
+--- a/CMakeLists.txt   2015-07-26 22:10:03.158276297 +0200
 b/CMakeLists.txt   2015-07-26 22:11:22.380277657 +0200
+@@ -45,14 +45,8 @@
+ Network
+ )
+ 
+-find_package(
+-Qt5 ${QT_MIN_VERSION}
+-QUIET
+-CONFIG
+-COMPONENTS
+-WebEngineWidgets
+-WebKitWidgets
+-)
++find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} QUIET CONFIG COMPONENTS)
++find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} QUIET CONFIG COMPONENTS)
+ 
+ find_package(
+ KF5 ${KF5_MIN_VERSION}

diff --git a/app-text/kbibtex/kbibtex-.ebuild 
b/app-text/kbibtex/kbibtex-.ebuild
index a2b6950..3a69dde 100644
--- a/app-text/kbibtex/kbibtex-.ebuild
+++ b/app-text/kbibtex/kbibtex-.ebuild
@@ -4,29 +4,54 @@
 
 EAPI=5
 
-inherit versionator kde4-base
+inherit kde5
 
-DESCRIPTION=BibTeX editor for KDE to edit bibliographies used with LaTeX
+DESCRIPTION=BibTeX editor to edit bibliographies used with LaTeX
 HOMEPAGE=http://home.gna.org/kbibtex/;
 if [[ ${PV} != ** ]]; then
+   inherit versionator
SRC_URI=http://download.gna.org/${PN}/$(get_version_component_range 
1-2)/${P/_/-}.tar.xz
KEYWORDS=~amd64 ~x86
 else
-   EGIT_BRANCH=master
+   EGIT_BRANCH=feature/kf5
KEYWORDS=
 fi
 
 LICENSE=GPL-2
-SLOT=4
-IUSE=debug
+IUSE=
 
 DEPEND=
-   app-text/poppler[qt4]
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep kjobwidgets)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   app-text/poppler[qt5]
+   dev-libs/icu:=
dev-libs/libxml2
dev-libs/libxslt
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtwebkit:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
virtual/tex-base
 
 RDEPEND=${DEPEND}
-   dev-tex/bibtex2html
+   dev-tex/bibtex2html
+
+
+PATCHES=( ${FILESDIR}/${PN}-fix-cmake.patch )
 
 S=${WORKDIR}/${P/_/-}