EAPI=5; add missing deps and fix build.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

4 files changed, 59 insertions, 24 deletions

diff --git a/x11-misc/qlipper/ChangeLog b/x11-misc/qlipper/ChangeLog
index edb4e48ea86a..373a97d9af28 100644
--- a/x11-misc/qlipper/ChangeLog
+++ b/x11-misc/qlipper/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/qlipper
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qlipper/ChangeLog,v 1.5 2013/10/01 22:05:22 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/qlipper/ChangeLog,v 1.6 2013/10/01 23:37:16 pesa Exp $
+
+  01 Oct 2013; Davide Pesavento <pesa@gentoo.org>
+  +files/qlipper-2.0.2-system-includes.patch, qlipper-2.0.2.ebuild:
+  EAPI=5; add missing deps and fix build.
 
 *qlipper-2.0.2 (01 Oct 2013)
 
diff --git a/x11-misc/qlipper/Manifest b/x11-misc/qlipper/Manifest
index 82f919c41e81..00d81d0eda3d 100644
--- a/x11-misc/qlipper/Manifest
+++ b/x11-misc/qlipper/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX qlipper-2.0.2-system-includes.patch 542 SHA256 be214e9d170c8a5d79f1a270a767bbeba04076af6a5ba885a12e31437c42ab4e SHA512 063be85614df0b3f0b5813578cfc55a0e6c8478641f8deee7532fbd13b4d33d58744eabd549c13b5d077939d6a1523c194e0d28994fb1383e8591bb8be0e79e8 WHIRLPOOL e54b99032c12c2ff8150091350a3adc79f4c21e91be9c5f23c12390f83d3e14f61e178f020d94cd2a422e8373ec479bacc21f1fc5e91eba9e55be6324064d238
 DIST qlipper-2.0.1.tar.bz2 75276 SHA256 8c93467819982a150398ef505fb5033e0c5794322992b11f5cebe73c2acef667 SHA512 56ecee642888e1cdfdb8d9c17d291bddc62fdf37cbef23753ad033d57559819174b7735e69ddb9fbae12a5d87b3614bc2768a8110e67c4c7f49718b77c142552 WHIRLPOOL c782c99d32aeea828d39af75404ef539cf1fcf243b1bb26430e6dec220657a57db574f8cd8c1056ab9d62d1be121a9859953385710d182215ffa593d9fa11e38
 DIST qlipper-2.0.2.tar.bz2 83544 SHA256 bd5463183966c6fee464b256b21f6e8397cd05faa20bd12719f7369a72c73958 SHA512 ac402f5d5fe77213192a59b0f52e780bf98f211868f88552a3bbcb400269714da42a5b13222a48aa0b8906c77100c8f5bf058dc159550e0d4a5575dc2917b268 WHIRLPOOL 87341e7172e3b5700a27e071d98fcf287b6cf795e99082707b73eaf4c4cc27e0da3c9e338d938b4a805f295e1163d51365a9f0373679787609ce986f536c91d7
 EBUILD qlipper-2.0.1.ebuild 722 SHA256 a1c53fddc5cfa11f8ad848bb4a0d922f3b2949f3cc798d958bf24a40bca504bb SHA512 f9e25f0fee588604fb0f39b28f4ef0d09f90501f68bb72ad2de61fae27a316ce7cdc6b24ce8a24f6a0bdbd32f7e5139e08f2077d5dd330d26935e310843e536f WHIRLPOOL ede84fd96740195b4c0f92c70f01c8345764aa6b859cf9dbf3fda7e0ae836205141f0a86d3cdefd379da41510f5d82a846c517fb325ad65e29d4a27d89b82464
-EBUILD qlipper-2.0.2.ebuild 718 SHA256 a39a14daa9fe397e51ab9adb0179e77149f7909346b2c89ef8b0b6ed87a88a60 SHA512 3b38740bea69e351f0607770b33fc583555b2ae317f88a4d1fb797747af9581e96b0dca64f873cad2e53a09744fc216f56baab731068764c32630a6c1af7e930 WHIRLPOOL 78796d6f0025b5e5ede18a7e5fa210ca4b8ad3ef6ee44cb8f77eb00bbbc79ecf275e6eaecaab573a21c14bb05bb3199ae7426687da48fb9575f3cb5c17bdad2c
-MISC ChangeLog 962 SHA256 efbf9a4b1d12837d9f44a6bc928fc7c4b9f007a405424abd6d9ba002e0dc4fea SHA512 e6452d24ecc73d1459370f9d8272ab2bb5553086480528fe9839f7f3149058d31f85afa7cffff74735edb6725644ed49da2581e6fc8fbcbb78dfc196f7765e72 WHIRLPOOL 46dd1297e428da4cd61625954903460ae8b0c513b3a2d0b78f9e829f649e2210b7fe8cb26d44457f8d3b3c7d9acf8ef8da1388e9969cd25acc628f98c80ed672
+EBUILD qlipper-2.0.2.ebuild 869 SHA256 bdb15416d325eea44aa1c2418a42f70b341826fe3d11c05a46fb2bd70ba393a4 SHA512 d85119faa257ee24cd2e7a3239c3424d9cddcee79083434ea00aef330c394bc41a1f2bb0fd5856516ca4ac8295c53646f692c9ee5a9f8e6f098120f2bdad5976 WHIRLPOOL 4aa18c36da87d7f0c6cc9c5d4b3fa37c4ad5fc188f077697380c070668525ea4616d340a0e46267f400df33dd1897fadf073e9cce6159dd4c89fff10371962c0
+MISC ChangeLog 1123 SHA256 d5abb9f1cc30722c4347a850cf7315462aa938dd1845551e03234ea8fb2b5602 SHA512 09ebe17354e88a0c75c6040dcca69ac26c74d218eadc412a69d8785448c179fc8b512db09c6bc042d74945c127a685c63d3de9260f1fda4da5621ea1eab873f5 WHIRLPOOL 7ae73cc5dce26dc1b0bc680c08998c8e199ee2ec43896152013ea8f2e4388e99552fe7a5de8e675af42f3a1fba3ba307db0d2de54c1c1fd288f761d7158c106d
 MISC metadata.xml 155 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7 SHA512 f05c8982778167c3667c9246b9730ba49fec2967731ed2c615e31a7fddc220fcea8c0843caa70a14957c8c4910892c512b6f2e00a9724d65e6032e1289f4562a WHIRLPOOL 25ccd49f04da07c8525fe18b21229764bb4104938abefc6c953bf9caa533dd5c10ae7b3f80a1251182e6c1520c09383d9f1d0ac1dc74832a99299c9be27406c4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSS0clAAoJENXLsxwXqFxy5ToP/A+GSiAxd21eBubYGGHsOLVl
-1rqLf39vkcEF4Jl/wplt8MQvRd28uDGps/0YfBrEAjG6+gkH8EfuuR0s8sIAGw3A
-VGlPm6ONEamqXtKK6FUBaLtqIXlQ7+bJZBhWwSbsTP7hYQJ/jBz6R8cyeoWSawUJ
-kS9uiU6dq44knyOERbUiKcYJM7p/D3ZaH+USb7VYhENK5sDI23pqZjA7IQU5qRAz
-vbmrIq/uS+vTa4HvN3BFmE/9j0kxA6c0SLu/b0b0V6aKnKStvZCczZIH/B5uzpjV
-g1chmr/0eSmYOJwr9C8X3j/hXhIAWBw1FZX54RlZQbkgnb5G2wrcwU1VNu5fQ+hS
-5SkyAnEo7xkTRbdtsXIbkgicRlU+csSMjYMO/gRXo9RnkVqkp0vnieRHVmE5CcZJ
-AdKrXTNlbtLdaWqLHlRd4S/9eir3j8/bZgaP0B/d6MMesWjt8iohB7Z8Mc/sFLxZ
-B1L2apUePknS7/v6Cy0elPIYifFhTFjBbP/Wc9ztii7vWeZ5JdYMsptFCY69F+SU
-0wAv/Urq7+v5v2TOa2jT9dyPAfVT7GDHBnY1YSrb2oND1WjSjlsniN58p8auX9WM
-xIxqG3eIax3WQl81WSJ7o0W66WnXRoRA1+8vsT70sYNSExgVDyYyXundatklS/1Q
-EMezfGN3VW8dW5yuq8LI
-=9CtT
+iQIcBAEBCAAGBQJSS1yvAAoJENXLsxwXqFxyuPAQAJNUxpJjus/Lj75AvQ/9h15v
+ADHy5OHB1J53ERu+1/avMOf39EwWLt5Q2LUgWt+V+NsWSROGXUhvjkZzq1UCzCKP
+yFQ0C6m9+F9PufNLc50cbO7dFvFjSB+cPyMgCZjPrFdfpL0/IRrbhSq2bC9JgweU
+qTJEauPbR48mT4yd4oTX46dIdndjGrB+bQwErtNuR8HL6V6qSFWWTYWbQaQ31iCu
+oUUwL/lxIoIawOmqVm9jMMDp4K2sXvG2dmWS1sZtsflmUkm1K+Ipbi8VT2zpdses
+HzHRyW+s6AAZraH5C1JwuQC3NiRGcB1LfoyZo5qYpsg7bNCG23yV1tL75KZOqifC
+3dx4jXkc4cpd/+jYdowMcjtenv3hxD0nJUqnulDdIL5G5SDd88P19hE9x2NmrYiw
+J7v23fPA8fqaf44BSq1ThWNlB/sypBBBQf6n5PlNABl1poAueTPQfwbyQn63RQgT
+3FzGomOsIO6d/nFytYePKAFcVZxXRt5mxrL3NO8yPo1z3D/7/o6PBdPvGUjIGT4T
+UMz4f3LD+DdYOzlDgnc1nRX5Wk2aSgg0quK56xfRTp6NZOFJnemBFZQvayDpYNDI
+49GX+Q1NEkQjCdqMqmsDVMvg6bpc+ei7fh9FJKIUmk8a6TvOn3sCBMADD7cib08w
+HyaCyg7ki0qWOHG3PBXo
+=ZsxR
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/qlipper/files/qlipper-2.0.2-system-includes.patch b/x11-misc/qlipper/files/qlipper-2.0.2-system-includes.patch
new file mode 100644
index 000000000000..1f478324e3f7
--- /dev/null
+++ b/x11-misc/qlipper/files/qlipper-2.0.2-system-includes.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a036f9b..92a471a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -187,9 +187,13 @@ include_directories (
+ )
+ if (NOT QTSINGLEAPPLICATION_FOUND)
+     include_directories(${CMAKE_CURRENT_SOURCE_DIR}/qtsingleapplication)
++else ()
++    include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIR})
+ endif (NOT QTSINGLEAPPLICATION_FOUND)
+ if (NOT QXT_FOUND)
+     include_directories(${CMAKE_CURRENT_SOURCE_DIR}/qxt)
++else ()
++    include_directories(${QXT_INCLUDE_PATH})
+ endif (NOT QXT_FOUND)
+ 
+ 
diff --git a/x11-misc/qlipper/qlipper-2.0.2.ebuild b/x11-misc/qlipper/qlipper-2.0.2.ebuild
index 03892e8f3b81..149176ac258e 100644
--- a/x11-misc/qlipper/qlipper-2.0.2.ebuild
+++ b/x11-misc/qlipper/qlipper-2.0.2.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qlipper/qlipper-2.0.2.ebuild,v 1.1 2013/10/01 22:05:22 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/qlipper/qlipper-2.0.2.ebuild,v 1.2 2013/10/01 23:37:16 pesa Exp $
+
+EAPI=5
 
-EAPI=4
 PLOCALES="cs sr"
-inherit l10n cmake-utils
+
+inherit cmake-utils l10n
 
 DESCRIPTION="Lightweight and cross-platform clipboard history applet"
 HOMEPAGE="http://code.google.com/p/qlipper/"
@@ -12,20 +14,30 @@ SRC_URI="http://qlipper.googlecode.com/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND="dev-qt/qtgui:4"
+DEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtsingleapplication
+	x11-libs/libqxt
+"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-system-includes.patch"
+)
+
 src_prepare() {
-	l10n_for_each_disabled_locale_do rm_loc
+	cmake-utils_src_prepare
+	l10n_for_each_disabled_locale_do rm_ts
 }
 
 src_configure() {
 	cmake-utils_src_configure INSTALL_PREFIX="${EPREFIX}"/usr
 }
 
-rm_loc() {
-	rm ts/${PN}.${1}.*
+rm_ts() {
+	rm -f "${S}"/ts/${PN}.${1}.ts
 }