diff options
-rw-r--r-- | x11-libs/libfakekey/ChangeLog | 13 | ||||
-rw-r--r-- | x11-libs/libfakekey/Manifest | 15 | ||||
-rw-r--r-- | x11-libs/libfakekey/files/libfakekey-0.1-ac.patch | 24 | ||||
-rw-r--r-- | x11-libs/libfakekey/libfakekey-0.1-r1.ebuild (renamed from x11-libs/libfakekey/libfakekey-0.1.ebuild) | 23 |
4 files changed, 66 insertions, 9 deletions
diff --git a/x11-libs/libfakekey/ChangeLog b/x11-libs/libfakekey/ChangeLog index 9d38210442bc..94220990ed9e 100644 --- a/x11-libs/libfakekey/ChangeLog +++ b/x11-libs/libfakekey/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for x11-libs/libfakekey -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfakekey/ChangeLog,v 1.7 2009/12/14 04:58:28 yvasilev Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfakekey/ChangeLog,v 1.8 2011/05/22 14:43:15 miknix Exp $ + +*libfakekey-0.1-r1 (22 May 2011) + + 22 May 2011; Angelo Arrifano <miknix@gentoo.org> -libfakekey-0.1.ebuild, + +libfakekey-0.1-r1.ebuild, +files/libfakekey-0.1-ac.patch: + - Fix underlinking, bug #367595 . + - Patch configure.ac to work with latest autoconf (based on commit + e13586b6b78d3636c3e00b437fdb4f3ac449b185 of cairo git) + - Move to EAPI 2. 14 Dec 2009; Yuri Vasilevski <yvasilev@gentoo.org> libfakekey-0.1.ebuild: Fixed dodoc QA notice, fixes bug #296757. Thanks flameeyes. diff --git a/x11-libs/libfakekey/Manifest b/x11-libs/libfakekey/Manifest index f97b97d7513f..4bfb9fe43acc 100644 --- a/x11-libs/libfakekey/Manifest +++ b/x11-libs/libfakekey/Manifest @@ -1,4 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX libfakekey-0.1-ac.patch 746 RMD160 b8af367085e8cfce081dc94c2ee4006e28bcac41 SHA1 ab14cbfbe2acfb1fc64d60f4f2939af936e1d1fe SHA256 f5239c79ee334e1d6b671a719d00a2f776b9e0c7894292a3cd9b021b1fbc81a1 DIST libfakekey-0.1.tar.bz2 203504 RMD160 990eda09f4271bf03eae1a87e1ee14ba96124648 SHA1 f302cd9f06d3bd34db1b48fc2caf2ac48e09ee79 SHA256 c41042a70524895b0edf8077ae3ae1206f1a313bea5811dcc23033ea16a00194 -EBUILD libfakekey-0.1.ebuild 950 RMD160 57cd94c2dfa954ed2f49b4e991e0b791db0a4c9f SHA1 bce26245e944938e933a2306662a5eb115c16af5 SHA256 5159a211349a0581898032332dad4dd15c8b88af2dfe0f83e811ff3b37dacadc -MISC ChangeLog 932 RMD160 a7fc936a7b17320d431aca75bb197b89fd7afdc0 SHA1 1e9b3313eb018386e4a9a03444162ca8b986c335 SHA256 337f091ddc3a6b034e0da3be6522e4b2392d0f1fd47d1ca1619b8c7c51d6b5d3 +EBUILD libfakekey-0.1-r1.ebuild 1206 RMD160 2fa2013fc9725c323aed1de65e884b953ff970c6 SHA1 30e3185801df7f449ffd8094ebc0d97721930f4c SHA256 ad5c1499178936cf10208e781b5711e36d20e8c47629edeb5997bae95237b488 +MISC ChangeLog 1283 RMD160 bcfe15a9bb754190511d9700effffe250db81e9a SHA1 fd006013629c959e610cce22be7f6805193d571e SHA256 7fa3356c0a385484b71bcc09ee1c9383033807e8f18b70e208bb53612decf872 MISC metadata.xml 247 RMD160 49e7f36b66be574d7f3341589ebff702e1c8c8a9 SHA1 af1f5473be400926e7bf9a98a354866150c8b7a7 SHA256 09c798d19a28d8e2ee2b8494e011929f5fc1617190315d82bd03c32e911def55 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk3ZIQMACgkQbkqODQcg/HTA9wCfWo245TUKbTfZtBKsfUiAVStt +1AwAnjdZFl4pxFEy8GaNxESTAPhBhk+i +=fNnk +-----END PGP SIGNATURE----- diff --git a/x11-libs/libfakekey/files/libfakekey-0.1-ac.patch b/x11-libs/libfakekey/files/libfakekey-0.1-ac.patch new file mode 100644 index 000000000000..65c0b083aa72 --- /dev/null +++ b/x11-libs/libfakekey/files/libfakekey-0.1-ac.patch @@ -0,0 +1,24 @@ +--- configure.ac.old 2011-05-22 14:59:45.801746472 +0100 ++++ configure.ac 2011-05-22 15:02:59.437159981 +0100 +@@ -14,16 +14,14 @@ AC_HEADER_STDC + + dnl ------ libtool versioning ----------------------------------------------- + +-LT_CURRENT=0 +-LT_REVISION=1 +-AC_SUBST(LT_CURRENT) +-AC_SUBST(LT_REVISION) +-LT_AGE=0 ++m4_define(LT_CURRENT, 0) ++m4_define(LT_REVISION, 1) ++m4_define(LT_AGE, 0) + +-LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE" ++LT_VERSION_INFO="LT_CURRENT():LT_REVISION():LT_AGE()" + AC_SUBST(LT_VERSION_INFO) + +-LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE` ++LT_CURRENT_MINUS_AGE="m4_eval(LT_CURRENT() - LT_AGE())" + AC_SUBST(LT_CURRENT_MINUS_AGE) + + dnl ------ Check for X Stuff ------------------------------------------------ diff --git a/x11-libs/libfakekey/libfakekey-0.1.ebuild b/x11-libs/libfakekey/libfakekey-0.1-r1.ebuild index 458869287626..4921baafa5c6 100644 --- a/x11-libs/libfakekey/libfakekey-0.1.ebuild +++ b/x11-libs/libfakekey/libfakekey-0.1-r1.ebuild @@ -1,6 +1,10 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfakekey/libfakekey-0.1.ebuild,v 1.8 2009/12/14 04:58:28 yvasilev Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfakekey/libfakekey-0.1-r1.ebuild,v 1.1 2011/05/22 14:43:15 miknix Exp $ + +EAPI=2 + +inherit eutils autotools DESCRIPTION="Helper library for the x11-misc/matchbox-keyboard package." HOMEPAGE="http://matchbox-project.org/" @@ -16,14 +20,23 @@ RDEPEND="x11-libs/libXtst" DEPEND="${RDEPEND} doc? ( app-doc/doxygen )" -src_compile() { +src_prepare() { + # Allow configure to use libtool-2 + epatch "${FILESDIR}/${P}-ac.patch" + + # Fix underlinking bug #367595 + sed -i -e 's/^fakekey_test_LDADD=/fakekey_test_LDADD=-lX11 /' \ + tests/Makefile.am || die 'Cannot sed Makefile.am' + + eautoreconf +} + +src_configure() { # --with/without-x is ignored by configure script and X is used. econf --with-x \ $(use_enable debug) \ $(use_enable doc doxygen-docs) \ || die "Configuration failed" - - emake || die "Compilation failed" } src_install() { |