summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-themes/gtk-engines-qtpixmap/ChangeLog9
-rw-r--r--x11-themes/gtk-engines-qtpixmap/Manifest20
-rw-r--r--x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild43
3 files changed, 41 insertions, 31 deletions
diff --git a/x11-themes/gtk-engines-qtpixmap/ChangeLog b/x11-themes/gtk-engines-qtpixmap/ChangeLog
index 63988657853c..fa1e1374e6d4 100644
--- a/x11-themes/gtk-engines-qtpixmap/ChangeLog
+++ b/x11-themes/gtk-engines-qtpixmap/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-themes/gtk-engines-qtpixmap
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtpixmap/ChangeLog,v 1.14 2012/05/05 04:10:06 jdhore Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtpixmap/ChangeLog,v 1.15 2013/09/29 09:30:01 pacho Exp $
+
+ 29 Sep 2013; Pacho Ramos <pacho@gentoo.org>
+ gtk-engines-qtpixmap-0.28-r2.ebuild:
+ Fix compile with latest automake (#469828)
05 May 2012; Jeff Horelick <jdhore@gentoo.org>
gtk-engines-qtpixmap-0.28-r2.ebuild:
@@ -117,4 +121,3 @@
22 Jul 2003; Brad Laue <brad@gentoo.org> qtpixmap-0.25.ebuild:
Add qtpixmap, a dependency of gtk-engines-geramik
-
diff --git a/x11-themes/gtk-engines-qtpixmap/Manifest b/x11-themes/gtk-engines-qtpixmap/Manifest
index 065ac9b6704e..0bb09778d807 100644
--- a/x11-themes/gtk-engines-qtpixmap/Manifest
+++ b/x11-themes/gtk-engines-qtpixmap/Manifest
@@ -1,5 +1,15 @@
-AUX gtk-engines-qtpixmap-0.28-gtk_switches.patch 3612 RMD160 3ed554fe563033a490902b651a3a0a8fa96e09d2 SHA1 d645d9972f3055ec6b23404a49f61a24c91c2a51 SHA256 45e917ab0579264c4bd5b160877df3b9d28a3f8a397d2d25d85a44720359bd8d
-DIST QtPixmap-0.28.tar.gz 429698 RMD160 e6f0c9e3de544a9765d57d235834adcf889a61a5 SHA1 fdbf2cc20c72e4280c1edda6efbd79d398fb44ca SHA256 514090d808db0c9ff04792663e24ac5ab663ae5b15ea4914cae8b76f4663a407
-EBUILD gtk-engines-qtpixmap-0.28-r2.ebuild 1232 RMD160 09379c8558d0528f88c27ca119e7e1419ca401d1 SHA1 6e0efdd2eaef34945e8e0b24c5db4552d6f34082 SHA256 57fb2f2d9bfccd2e2bf48f3e39e48a52679cb5f6a21d98dec1e3ceffe36bc03c
-MISC ChangeLog 3894 RMD160 bd01c0d826ff9f60182792096279073b9feb34cb SHA1 faa07be9a8340c909f5b474b06f1235c3ddc422c SHA256 908d925a596f99741f68d5132197684a878941dcb4bf987b286a5fdbcb78e77c
-MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX gtk-engines-qtpixmap-0.28-gtk_switches.patch 3612 SHA256 45e917ab0579264c4bd5b160877df3b9d28a3f8a397d2d25d85a44720359bd8d SHA512 2e3162f85cde2f2ba4e0cf6e9812af53a3e0802a9e47f1a993bc9c8ccd559c2f71d6781189ffc765d54fdbe725a36165d9a5addabab12f30a471ef5982d8750a WHIRLPOOL ad2f9b94a23f1d2a0dee07951559e999d383d1c512108987a5bb43349dd740f7e84519a1e0602584443a0bcd2235ec62435326e582bff60ad9925e74a4d9b08b
+DIST QtPixmap-0.28.tar.gz 429698 SHA256 514090d808db0c9ff04792663e24ac5ab663ae5b15ea4914cae8b76f4663a407 SHA512 42a16ed163ed12665d5db587bec3babcd5d802e63a3c282a9382041dc22e0dbcdfc9ae739b8ce224525c877b31f9c615d2c731a633722151a9b1185621a96e55 WHIRLPOOL 04ad32ca0561632203303efa56cd7bc4d407ca244a304a3c4e03289d245f229ffc965324209c122e5f3f62dc9f53014e875f9a043e317c7a2dcca0bb34d6df45
+EBUILD gtk-engines-qtpixmap-0.28-r2.ebuild 1167 SHA256 c3b7fb449f9d31bfe0400dd2258c5c85c3c182f56c844a105bc65dbefccc8d98 SHA512 6d62b59f0857f47aecfd6c4494ef163bf04a4e1b7223727086d80dc9c40ca837acb87f5b4e617facf8736f80cf0a0c04e9726f9b9439f3016bc6c90abb791b57 WHIRLPOOL 239eb0c56f647fc09a5bc2ad4d98de656cfa51086b35cd8c880552f173bc524a7a33ca5e1e0a3c39a4c9c1a6f42255eba2dda70f95db05205d7bf0dc5a8f4567
+MISC ChangeLog 4023 SHA256 d054c00b5d2d71e55f76363f07fa12d40094a1fa1eed791a5a7e5e8fa47de1eb SHA512 bcf38339e6ba139b26012c79b5be85b396c85cff137aa931e5520d09ffd00a492b39aa3bf49b4e13bebde5e7a98eaceea6fb57d6aebeffb6ade87ac2323d0b68 WHIRLPOOL 4cd040af536c167ab6c61fd14a59cc9267799a4e9c105ebc5d9d98669ada272729a9df45654f480c39a87a68518811cd5366c38b184bbf94545ff17b4424d8c1
+MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iEYEAREIAAYFAlJH8xoACgkQCaWpQKGI+9QR1gCeI6dujdzZmfQL5SfB3EjNm3gx
+4pgAnAsreUP4UeVT5DcFKP2j+/mWCOJd
+=K5/u
+-----END PGP SIGNATURE-----
diff --git a/x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild b/x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild
index fc52e56593d2..c26cb725c280 100644
--- a/x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild
+++ b/x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild,v 1.11 2012/05/05 04:10:06 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild,v 1.12 2013/09/29 09:30:01 pacho Exp $
-EAPI="1"
+EAPI=5
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
-inherit autotools eutils
+inherit autotools eutils gnome2
MY_P="QtPixmap-${PV}"
@@ -19,34 +21,29 @@ SLOT="0"
IUSE=""
RDEPEND="x11-libs/gtk+:2"
+
DEPEND="${RDEPEND}
- virtual/pkgconfig"
+ virtual/pkgconfig
+"
S=${WORKDIR}/${MY_P}
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
+src_prepare() {
# Add switches to enable/disable gtk1 and gtk2 engines in the configure
# script.
epatch "${FILESDIR}/${P}-gtk_switches.patch"
- sed -i \
- -e 's/AC_CHECK_COMPILERS/AC_PROG_CC/' \
- configure.in
- rm acinclude.m4
- eautoreconf
-}
-src_compile() {
- local myconf="--enable-gtk2 --disable-gtk1"
+ sed -i -e 's/AC_CHECK_COMPILERS/AC_PROG_CC/' configure.in || die
+ sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
- econf $myconf || die "Configuration failed"
- emake || die "Compilation failed"
-}
+ rm acinclude.m4
-src_install() {
- emake DESTDIR="${D}" install || die "Installation failed"
+ eautoreconf
+ gnome2_src_prepare
+}
- dodoc AUTHORS ChangeLog README
+src_configure() {
+ gnome2_src_configure \
+ --enable-gtk2 \
+ --disable-gtk1
}