diff options
| -rw-r--r-- | x11-misc/fraqtive/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-misc/fraqtive/Manifest | 25 | ||||
| -rw-r--r-- | x11-misc/fraqtive/files/fraqtive-0.4.5-qt-4.8.patch | 26 | ||||
| -rw-r--r-- | x11-misc/fraqtive/fraqtive-0.4.8.ebuild (renamed from x11-misc/fraqtive/fraqtive-0.4.6.ebuild) | 38 |
4 files changed, 42 insertions, 55 deletions
diff --git a/x11-misc/fraqtive/ChangeLog b/x11-misc/fraqtive/ChangeLog index bfda649b7cd1..6fdd4d07bf57 100644 --- a/x11-misc/fraqtive/ChangeLog +++ b/x11-misc/fraqtive/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-misc/fraqtive # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/fraqtive/ChangeLog,v 1.16 2015/01/28 22:22:41 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/fraqtive/ChangeLog,v 1.17 2015/02/05 09:38:29 jer Exp $ + +*fraqtive-0.4.8 (05 Feb 2015) + + 05 Feb 2015; Jeroen Roovers <jer@gentoo.org> -fraqtive-0.4.6.ebuild, + +fraqtive-0.4.8.ebuild, -files/fraqtive-0.4.5-qt-4.8.patch: + Version bump. 28 Jan 2015; Michał Górny <mgorny@gentoo.org> fraqtive-0.4.6.ebuild, fraqtive-0.4.7.ebuild: diff --git a/x11-misc/fraqtive/Manifest b/x11-misc/fraqtive/Manifest index ad5e73f9321f..67c7fe78885c 100644 --- a/x11-misc/fraqtive/Manifest +++ b/x11-misc/fraqtive/Manifest @@ -1,29 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX fraqtive-0.4.5-qt-4.8.patch 564 SHA256 433397504a437c53d2947c865e03d5299c3411613ee8813025244eda020a0f30 SHA512 45d6b2e7c96f346aa943c30c2898c816e5b2741f2e472243495e93f023ec194031f30638dafa107c57db7ccf2dd5dd39b39d2723d348dc24e8206b7baa6ea8e2 WHIRLPOOL bae2acb1b293c43934e64795afcc4b5461b371b36db0186209c7fc60c8149783a540e3212e64455d263170d1f6442ba89765a3f240487b8457ff9bd375cffcac -DIST fraqtive-0.4.6.tar.bz2 202647 SHA256 5b799a1da39de1e6aa28674e3c2a2359df630c42f9d9b3fa051dee0db4aace4c SHA512 6661ce09a03f92b8429fd68893a0eea15a9a6b99932e22d82eca886709a475bf8729110c2e6576f851a6a4f8b3e414c2220fcbfc3ef12c80b2dc923165b19d65 WHIRLPOOL 3a677df46e63dcc853316bf197d2bfaf42cf559218cc952c62afab9a12d537f786a6a7496d67a7f2ba6bd4fa9a2f36242f9dc35e45afe61713aa3710fe83c2b3 DIST fraqtive-0.4.7.tar.bz2 259933 SHA256 f280ada46b1d91859747e7ba6d53aee3ffbb5c3cba803a0b6ffbc155d9e70d72 SHA512 7298be12b67f87f1a0249ea76319360af1477053cb1def67541f362f4e0bd72ee1c13ad1d98cbf4e155f4a1c8509b2553c39e5f4a585b91b53da2b64160d1f0c WHIRLPOOL 251cb00314abb12b053e4b752ba3647305b1609c530ff79d53f711cc4397459d7bdb720ca32f0e6608018c56d059a6a43e9f02b636aab8088f6dc7ed027f9d0b -EBUILD fraqtive-0.4.6.ebuild 1066 SHA256 5514c845ed15906259464bbc07745eff9c71eb20659852ae632c11b172b4570c SHA512 b29e30c010ba92e4b3afe24bd6c34811b5f16097e4c9ba2a4a1d01499f5a1b442c8e4e49f838e69f897dfce508c4cacafb78e0a47c3b1fb39fd3563284876279 WHIRLPOOL f772f902ca2e3968b9536bb07da1e312966913b5a73e9e06e6e5dc8a466573f90721769257793a41097a7715f48a41db8bf16e4a4e1c0cadc472c1b9dfc2dadc +DIST fraqtive-0.4.8.tar.bz2 260484 SHA256 dbb21b5e6305cbf02c27aaedb12c5125ac873600bce10d12e88b2305a2083cd7 SHA512 8b4be81dd14fe086dbcffda123395ccb30a197e7762e590bc3ab7dc1d0aafb44dc45e1445e2f83198a0c1f4b9ea0d54a7de1989c3b85c0f2e5f474a67255d942 WHIRLPOOL 29bfc8574d63ac6e77c36531e1dd9aa63810af12e6669f8248c364f6dd42088ac1418cdce6c1b760dc922bbded65b148e0079f8c56df69e27f42b093212ee7c3 EBUILD fraqtive-0.4.7.ebuild 1369 SHA256 de74372243e77ff05617a345986c583154c3d67242913f7fe0b4b3356a477573 SHA512 e6426cfdb203eea6dab71752fe177d622d9a3c5a20376e985be4d2e9a2463ec73bc3f7eb8c73be5cc98d1532ed0fa2b134098e6813b2801a6b78235d1779f2e4 WHIRLPOOL a1708e8649a07c852405322732c2c86b87a56eab5798234fa5c7a955296def3ef3274fb1534a4081ec172701ffc218b45434a0e4ce167ba8747c6faa6e832367 -MISC ChangeLog 2566 SHA256 0ff8123e58f0edeb9a123532ae89bb8debfec99a3005393915e4b07b29906eee SHA512 766764627429fe9a7d7ee7897356e8c8434b7ce48ec40c1e7aad8a773c980e6422872877708d6a4773625dec0ff50bbf3d5baba3ac27f614fbad8effb89c0400 WHIRLPOOL e887e727361f0be45c6a8850c225ff11b2130accd22902c7e91f68ecf01d27806cdc398d1b5a3d731b03e5c51dcc3d45b7a8e045e686c768afa9f670a9176019 +EBUILD fraqtive-0.4.8.ebuild 1366 SHA256 95f613660d370740b00d908d51f930966332c3d5943b2cf5c0de030e95a1affd SHA512 4d691df4982bd66bca1811f333c9b78971a70630aefaa1a6f69f654982e93caeddaa37df826cafdca53cf33083afded9fcf109265b96b46480c2a29b06340351 WHIRLPOOL fb38a54a7c499d35f48134414e6913824fad479231117e94b2ee285552d457601d97898c2f1dba5e04715c16fdca3cb1eff5caf3f6fd2267636b4c225808a228 +MISC ChangeLog 2744 SHA256 511829def18d1da90f9f525e7a408019f5a7b6d89151225730bedcddc188f99a SHA512 6427191396627d315d93c0d87008bd4db9236fd9bce8697387cff38f99ed1ce42e0f3854a76e9b8b37fb37db38b4214f6ab57166e2ece532cbee953e66e32d81 WHIRLPOOL 1a475069923c7d21a00334f823b5b3b101b57a67723445abfad571c32fc85f93bc20589ba84f6651a360fc3d29248dac4f50c3ab1c495f2a4629ae8ca3b84a1e MISC metadata.xml 167 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241 SHA512 381c3c70deed443ca617d0535541542579acffb8dde5f577acf789380f0cdec6d395fa6a45483978648fa2d4e9dab13a441ebdc95664f5f414efbcc812705754 WHIRLPOOL f4a9e5a69adee7e8ee1e5e7ba1b4b860c5060a80db845e0c7f12c96ab44a86dc81adb6aff76c5130b4ab2ffe5ea18f0a5afc9d87a61177d99a8fc9f49d7e9d6f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJUyWEyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOyWYP/j7wRdc2vwn7b4aBFdLuzGsD -ZjIzsdsqjYQBlBdaHHrlAh/VppUbru3t0fziM10SCKoij/+CaoNgMPpUq96SRonV -go0wX5MfJTYRnBncBIAuEmyvB2CmUS6EjMTPGavlGu4xfy+DpAOL93kJUTru27V1 -JOScjVUczQBN9mM/Z0oJUz+Q0UzKitqH7S4fbAAu/mgCHfUxLbHW77VjMm4guCuy -aKdp9fYt/r83FgeC9MV4tIbOmVw1+oh2lEJ/yJ+X3IwE8oacs1/rF6Y3OMT5deQ0 -xKUipBW5j4k744Yn0C9NCwYCC4F3gO4ia4jzh624ul+4w5Nu3ua5G2pv7hwBLWDw -3jP7Xq12TOakx/GxcHw4oOlrdpMaDi5Gfema4lGQ85920OdYYj2sV8pT3Nyi1v1u -hhTfgVD2KCRmzGJSRDkqwQkka+TcEpf9ay+ex9c36fYbescuqcKm4e30FKOrQJWY -D2V8pe54XARqAhlT0uq8/99emXnDbLNDon6ZDCPX86bVtcXPqmKjWxlllp+hppW8 -SYnJhDQ0nswGp96o/A9c1+VvHlKv2BjPXqxgN5RaUOg4vBq3XMLldYWzmkXoXeGx -bBjiTdB7r7m6kjLg94chRdP/56nYkwwUFfcS+NePWAK5lK0podlV0iNhhwHXi+zO -LRZCixdLMjcpqFJVHU5J -=Zhm+ +iEYEAREIAAYFAlTTOhcACgkQVWmRsqeSphOlVQCcCkrKYAmR520BsKbn8OZ+jqqP +7N8An33JviMuraJVuk4kEVgLbKD4Nq9k +=IQrE -----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 deleted file mode 100644 index a60c4d6f927a..000000000000 --- a/x11-misc/fraqtive/files/fraqtive-0.4.5-qt-4.8.patch +++ /dev/null @@ -1,26 +0,0 @@ -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.6.ebuild b/x11-misc/fraqtive/fraqtive-0.4.8.ebuild index 7d920f8bc96f..cb4a4fc1e9e7 100644 --- a/x11-misc/fraqtive/fraqtive-0.4.6.ebuild +++ b/x11-misc/fraqtive/fraqtive-0.4.8.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/fraqtive/fraqtive-0.4.6.ebuild,v 1.4 2015/01/28 22:22:41 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/fraqtive/fraqtive-0.4.8.ebuild,v 1.1 2015/02/05 09:38:29 jer Exp $ EAPI=5 -inherit eutils gnome2-utils qt4-r2 +inherit eutils gnome2-utils qmake-utils toolchain-funcs DESCRIPTION="an open source, multi-platform generator of the Mandelbrot family fractals" HOMEPAGE="http://fraqtive.mimec.org/" @@ -12,17 +12,29 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="cpu_flags_x86_sse2" +IUSE="qt5 cpu_flags_x86_sse2" -DEPEND=" - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtopengl:4 +RDEPEND=" + !qt5? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + dev-qt/qtopengl:4 + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + ) virtual/glu " -RDEPEND="${DEPEND}" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" src_configure() { + tc-export PKG_CONFIG + sed -i -e "s|-lGLU|$( ${PKG_CONFIG} --libs glu )|g" src/src.pro || die local conf="release" if use cpu_flags_x86_sse2; then @@ -36,7 +48,15 @@ src_configure() { # Don't strip wrt #252096 echo "QMAKE_STRIP =" >> "${S}"/config.pri - qt4-r2_src_configure + if use qt5; then + eqmake5 + else + eqmake4 + fi +} + +src_install() { + emake INSTALL_ROOT="${D}" install } pkg_preinst() { |