diff --git a/x11-themes/gtk-engines-equinox/Manifest b/x11-themes/gtk-engines-equinox/Manifest index a11284d0..d3f8b605 100644 --- a/x11-themes/gtk-engines-equinox/Manifest +++ b/x11-themes/gtk-engines-equinox/Manifest @@ -1,2 +1,3 @@ -DIST 121881-equinox-1.30.tar.bz2 616171 RMD160 7c537b7b5037ae08cb37b668142e954bfecf6543 SHA1 3256ffaf3e0770029bbc0cd7806ad34dab1bb4fe SHA256 1fea28bb08e89c63bdcb9ba8ee612b4e8fd9bea56a715efe6d7d8bcd7848013f -EBUILD gtk-engines-equinox-1.30.ebuild 997 RMD160 abe96e25280f3f1c77185a917ea8c6e672f3d2da SHA1 de7826c9c858cd89feaa7582efb2c9c934e80a1e SHA256 8d079d9589f3597f268017abdf9516be614161541ac2b405b2c1f601fde1117b +AUX gtk-engines-equinox-1.50-dont-include-glib-gtimer-h.patch 276 SHA256 fb94e988d2d3862caa4462f36f40256cc67532127bb3f9ab292546c76dce13c1 SHA512 22b71ca05229c4beb90a7491fdc1d8261640ec762c6ad7fd5ce23fe0e5610012cbbb71b9c7ad89cc32129cbd3a21a6804269281a264fb65ca0e69bed7776f718 WHIRLPOOL a3ca3dca4eb6b680b6821d6aac0fa21c24aa6eba91daad107cc0ee97099429b95b7ee3b457b0b4d7b8402365c199af3374ec630ae2f4e429a04fd947a5f5328d +DIST gtk-engines-equinox-1.50.tar.gz 360957 SHA256 0cf8b8cc841e0da7d4a08ab5a70d3bb330fd76bdcb03165a47aaddcd47e02227 SHA512 67f73b204b2b0ad483a606f6c165998504d797f3dc06d44779ba21be39535531a13771ca4e8fe559ab51e6e7cb2ff2a562b2ddc5fe6d4018248adb0402d19d80 WHIRLPOOL 2a9a15db4644d8ad3e7e67bb901bf2020d27501a992af27d352ccea677fd993bdfe08f8bd68b6af6341a1285947890569c33076a74f2ca0de83cd97e9c9c382b +EBUILD gtk-engines-equinox-1.50-r1.ebuild 803 SHA256 742097dd77f466b0d7cd32792686503e8fbc15c5adc1b56e5371bbcdf74cb9ba SHA512 6782b3dc7d0e4fe2bef75bfd026000b91125b5aa276f6b13318013abefe204c0467fdbce7ba3018d6576851e184e7925265f62ed9ece02f54db0e2747e1bc5ce WHIRLPOOL 1398b4073bb322b6c0733488286004633cba563e5ff73dac8f70e29e16dd5f2cc9d08bf9dfa89c886de11f650d56bc21fe165bf091f3b10aaf9b9ff807bbe58f diff --git a/x11-themes/gtk-engines-equinox/files/gtk-engines-equinox-1.50-dont-include-glib-gtimer-h.patch b/x11-themes/gtk-engines-equinox/files/gtk-engines-equinox-1.50-dont-include-glib-gtimer-h.patch new file mode 100644 index 00000000..57a188b7 --- /dev/null +++ b/x11-themes/gtk-engines-equinox/files/gtk-engines-equinox-1.50-dont-include-glib-gtimer-h.patch @@ -0,0 +1,10 @@ +--- equinox-1.50-ce/src/animation.c 2012-11-17 22:31:05.437625638 +0100 ++++ equinox-1.50/src/animation.c 2012-11-17 22:31:53.797625956 +0100 +@@ -7,7 +7,6 @@ + #include "animation.h" + + #ifdef HAVE_ANIMATION +-#include + + struct _AnimationInfo { + GTimer *timer; diff --git a/x11-themes/gtk-engines-equinox/gtk-engines-equinox-1.30.ebuild b/x11-themes/gtk-engines-equinox/gtk-engines-equinox-1.50-r1.ebuild similarity index 58% rename from x11-themes/gtk-engines-equinox/gtk-engines-equinox-1.30.ebuild rename to x11-themes/gtk-engines-equinox/gtk-engines-equinox-1.50-r1.ebuild index 711b9d41..4fffa863 100644 --- a/x11-themes/gtk-engines-equinox/gtk-engines-equinox-1.30.ebuild +++ b/x11-themes/gtk-engines-equinox/gtk-engines-equinox-1.50-r1.ebuild @@ -1,18 +1,21 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# $Header: $ EAPI=2 +inherit eutils + MY_P=${P/gtk-engines-} DESCRIPTION="A heavily modified version of the Aurora engine" HOMEPAGE="http://gnome-look.org/content/show.php/Equinox+GTK+Engine?content=121881" -SRC_URI="http://gnome-look.org/CONTENT/content-files/121881-${MY_P}.tar.bz2" +SRC_URI="http://gnome-look.org/CONTENT/content-files/121881-${MY_P}.tar.gz + -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64" -IUSE="" RDEPEND="x11-libs/gtk+:2" DEPEND="${RDEPEND} @@ -22,15 +25,10 @@ S=${WORKDIR}/${MY_P} src_unpack() { unpack ${A} +} - echo Untarring engine files... - tar xpf "${WORKDIR}/equinox-gtk-engine.tar.gz" || die - cd ${S} - - echo Untarring themes files... - mkdir themes - cd themes - tar xpf "${WORKDIR}"/equinox-themes.tar.gz || die +src_prepare() { + epatch "${FILESDIR}/${P}-dont-include-glib-gtimer-h.patch" || die } src_configure() { @@ -39,10 +37,5 @@ src_configure() { src_install() { emake DESTDIR="${D}" install || die - dodoc AUTHORS COPYING ChangeLog NEWS - - echo Installing themes... - dodir /usr/share/themes/ - insinto /usr/share/themes/ - doins -r themes/* || die + dodoc AUTHORS ChangeLog NEWS }