eapi bump, fix compilation for qt-4.8 wrt #427412, update icon cache

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 66 insertions, 19 deletions

diff --git a/x11-misc/fraqtive/ChangeLog b/x11-misc/fraqtive/ChangeLog
index 66a465a6a67e..d573602504fd 100644
--- a/x11-misc/fraqtive/ChangeLog
+++ b/x11-misc/fraqtive/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/fraqtive
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fraqtive/ChangeLog,v 1.10 2010/12/05 12:02:09 xarthisius Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fraqtive/ChangeLog,v 1.11 2012/07/21 18:53:24 hasufell Exp $
+
+  21 Jul 2012; Julian Ospald <hasufell@gentoo.org> fraqtive-0.4.5.ebuild,
+  +files/fraqtive-0.4.5-qt-4.8.patch:
+  eapi bump, fix compilation for qt-4.8 wrt #427412, update icon cache
 
 *fraqtive-0.4.5 (05 Dec 2010)
 
diff --git a/x11-misc/fraqtive/Manifest b/x11-misc/fraqtive/Manifest
index f2de83f756a3..74d811950231 100644
--- a/x11-misc/fraqtive/Manifest
+++ b/x11-misc/fraqtive/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST fraqtive-0.4.5.tar.bz2 159954 RMD160 63066fb99e9136faef7036a552ea2d562961239e SHA1 2529f98ccc3cd7b0305e32605ba7049a799ebf8b SHA256 17537ddc3c01d3bbfb52f66d68bffb84d66a9bca5adcb3b1ecdc66a920445cf6
-EBUILD fraqtive-0.4.5.ebuild 873 RMD160 7beac7c6f8d7ea5dba2c5b236365de23af7138f0 SHA1 f89a3b8f6e674351979ab9c4359f29d3e10bd954 SHA256 0760035b7ad155e117c321611c20154ef4958879eddb5af7a4d329f37102096e
-MISC ChangeLog 1712 RMD160 6e4a88979f45ac1a2826a455f6914d28f33a5fa3 SHA1 8eea688380a11c5a5a387aa3240dcac885041393 SHA256 2dded9963355184cb29d615a9f01c5bad8bee1b2e0c4b333c24325899b078141
-MISC metadata.xml 167 RMD160 6f174fdd5033945a3da1b7bbea9796fe17ba2bf8 SHA1 26b8b030985c93a71d6d34f25249320a30b22f36 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241
+AUX fraqtive-0.4.5-qt-4.8.patch 564 SHA256 433397504a437c53d2947c865e03d5299c3411613ee8813025244eda020a0f30 SHA512 45d6b2e7c96f346aa943c30c2898c816e5b2741f2e472243495e93f023ec194031f30638dafa107c57db7ccf2dd5dd39b39d2723d348dc24e8206b7baa6ea8e2 WHIRLPOOL bae2acb1b293c43934e64795afcc4b5461b371b36db0186209c7fc60c8149783a540e3212e64455d263170d1f6442ba89765a3f240487b8457ff9bd375cffcac
+DIST fraqtive-0.4.5.tar.bz2 159954 SHA256 17537ddc3c01d3bbfb52f66d68bffb84d66a9bca5adcb3b1ecdc66a920445cf6 SHA512 08cc3967d410047e22e79474e055a8957e02c6e269460cf5bf3cd3df4ac07555fb5ea88c9cbc05a67f4c22a2b6ef96056fd76a9e63082bfaf317ecf96dd3a686 WHIRLPOOL 4129650644ac897f97d647d03419cb81ab025591f930f0519a6c41bbd942bee16cb0801fe6f6ad12d35d11a364f15c3dd8181b187289c1d4bf2adee954d2d24e
+EBUILD fraqtive-0.4.5.ebuild 1064 SHA256 452f1c73db821d7a296f0cb40527c22708fc04070aec57a498f3c4267c71c4ca SHA512 81e4edcb09d7505a121fc984b6e10cac9a70ec6fc0a4f8951b1ecaf70512ee31ad60ccf6f87b186cb99b42eac317e89437eb5970fac328a079cbe974ab7f5c0c WHIRLPOOL 3e24988acc3a0353b6ed769c66d95e3322e72fea418a57643fd7222145b197099508e61b7234b43d3d523e0e41b158adae5674f545c46f3f4621cfcc760e50e7
+MISC ChangeLog 1894 SHA256 e796256f3c753589615e3d2bb9785de86696c41c3c8c94a802630a37eb4c2189 SHA512 83fd6c513b8e2b22ad1f501f01b1c8fc74ca091ad183b3d3516e94839aaf310fcb1172dfe8744b63841f75e0fc9d3b4f9bd3ed6d26e9d1cc281e20cceedefff8 WHIRLPOOL 97408a0d1d6c562dd5f7e3136f662cc59d5f2f8705612ec9fa617f60e79654ded907161789291179549c14a9f67b902fc136ca3c76be4c8314a12f018c481bc4
+MISC metadata.xml 167 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241 SHA512 381c3c70deed443ca617d0535541542579acffb8dde5f577acf789380f0cdec6d395fa6a45483978648fa2d4e9dab13a441ebdc95664f5f414efbcc812705754 WHIRLPOOL f4a9e5a69adee7e8ee1e5e7ba1b4b860c5060a80db845e0c7f12c96ab44a86dc81adb6aff76c5130b4ab2ffe5ea18f0a5afc9d87a61177d99a8fc9f49d7e9d6f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQECAAYFAkz7f08ACgkQIiMqcbOVdxQkJQP9H3Gh3iW/7sSwErgCrqMqDmGg
-IOMbctu9EceNUUi1/Kau/a7AjidWlRyUuLYNd3PdHIu1fQnoT44/7qppk91qDVvd
-fL4k0JcWKsGPq58AdWjDomw+kTvf+i54vaOgY5YfUXFm7HvBYPB3/o25SX5RU8br
-YTKV4s6mxR91VVpHeJ0=
-=kLGY
+iQEcBAEBCAAGBQJQCvm3AAoJEFpvPKfnPDWzy+MH/j8v9XySRVG0+POLUWWYMCnU
+aoCVqL6XSTVdBPkcPzE92EHP8hBatDesRhCiIXDKCYVgE1audQhbyF6BY7kxIgWl
+Fc25FlnTVDxcHp74VFKhuGjpYvFpiNI28QqnzDG572MEOestSRwLXDBdpHHn4BLi
+maocerpezluWatuIHzf4PnEdfSQ/zCaqQsdJW91DVxsSGQWUYASdhhY0PpQks+ou
+SRSFbTnMTgnzFRmQGaJqeH51z/Y6naF+fbQAciWvX//S8CTUilACwI3jbdPZxWUE
+3M9bG5p0fmbH8R90iOrPwn6/vST8hhOPNVxtwJNamg/CWngRRY2303rZc+cfitc=
+=Z5o9
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/fraqtive/files/fraqtive-0.4.5-qt-4.8.patch b/x11-misc/fraqtive/files/fraqtive-0.4.5-qt-4.8.patch
new file mode 100644
index 000000000000..a60c4d6f927a
--- /dev/null
+++ b/x11-misc/fraqtive/files/fraqtive-0.4.5-qt-4.8.patch
@@ -0,0 +1,26 @@
+Description: Fix FTBFS with Qt 4.8. Include and link against GLU.
+Author: Felix Geyer <debfx-pkg@fobos.de>
+
+--- fraqtive-0.4.5.orig/src/src.pro
++++ fraqtive-0.4.5/src/src.pro
+@@ -154,6 +154,10 @@ win32 {
+     LIBS += -lshell32
+ }
+ 
++unix {
++    LIBS += -lGLU
++}
++
+ MOC_DIR = ../tmp
+ RCC_DIR = ../tmp
+ UI_DIR = ../tmp
+--- fraqtive-0.4.5.orig/src/meshview.cpp
++++ fraqtive-0.4.5/src/meshview.cpp
+@@ -19,6 +19,7 @@
+ #include <QMouseEvent>
+ #include <QWheelEvent>
+ #include <QKeyEvent>
++#include <GL/glu.h>
+ 
+ #include "fractalpresenter.h"
+ #include "datafunctions.h"
diff --git a/x11-misc/fraqtive/fraqtive-0.4.5.ebuild b/x11-misc/fraqtive/fraqtive-0.4.5.ebuild
index e66006498867..d46742f85c2b 100644
--- a/x11-misc/fraqtive/fraqtive-0.4.5.ebuild
+++ b/x11-misc/fraqtive/fraqtive-0.4.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fraqtive/fraqtive-0.4.5.ebuild,v 1.1 2010/12/05 12:02:09 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fraqtive/fraqtive-0.4.5.ebuild,v 1.2 2012/07/21 18:53:25 hasufell Exp $
 
-EAPI=3
+EAPI=4
 
-inherit qt4-r2
+inherit eutils gnome2-utils qt4-r2
 
 DESCRIPTION="Fraqtive is a KDE-based program for interactively drawing Mandelbrot and Julia fractals"
 HOMEPAGE="http://fraqtive.mimec.org/"
@@ -15,12 +15,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="sse2"
 
-DEPEND="x11-libs/qt-core:4
+RDEPEND="x11-libs/qt-core:4
 	x11-libs/qt-gui:4
 	x11-libs/qt-opengl:4"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-qt-4.8.patch
+
 	local conf="release"
 
 	if use sse2; then
@@ -34,3 +36,15 @@ src_prepare() {
 	# Don't strip wrt #252096
 	echo "QMAKE_STRIP =" >> "${S}"/config.pri
 }
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}