diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-02-19 15:18:32 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-02-19 15:18:32 +0000 |
| commit | d412ad139ec7690ecafee1287a694822d2cba362 (patch) | |
| tree | 9b405f91fc905c647cc7e14463783c79b7a1b2cd | |
| parent | Stable on alpha, bug #393847 (diff) | |
| download | gentoo-2-d412ad139ec7690ecafee1287a694822d2cba362.tar.gz gentoo-2-d412ad139ec7690ecafee1287a694822d2cba362.tar.bz2 gentoo-2-d412ad139ec7690ecafee1287a694822d2cba362.zip | |
Stable on amd64 and x86.
(Portage version: 2.2.0_alpha87/cvs/Linux x86_64)
| -rw-r--r-- | app-misc/g15daemon/ChangeLog | 7 | ||||
| -rw-r--r-- | app-misc/g15daemon/g15daemon-1.9.5.3-r5.ebuild | 24 |
2 files changed, 17 insertions, 14 deletions
diff --git a/app-misc/g15daemon/ChangeLog b/app-misc/g15daemon/ChangeLog index 96a0c9284a5b..be9240360f4a 100644 --- a/app-misc/g15daemon/ChangeLog +++ b/app-misc/g15daemon/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-misc/g15daemon -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/ChangeLog,v 1.38 2011/09/09 15:19:23 scarabeus Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/ChangeLog,v 1.39 2012/02/19 15:18:32 scarabeus Exp $ + + 19 Feb 2012; Tomáš Chvátal <scarabeus@gentoo.org> g15daemon-1.9.5.3-r5.ebuild: + Stable on amd64 and x86. *g15daemon-1.9.5.3-r5 (09 Sep 2011) diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r5.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r5.ebuild index 12baaa748a4e..8f68c89710b5 100644 --- a/app-misc/g15daemon/g15daemon-1.9.5.3-r5.ebuild +++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r5.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r5.ebuild,v 1.1 2011/09/09 15:19:23 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r5.ebuild,v 1.2 2012/02/19 15:18:32 scarabeus Exp $ -EAPI=3 +EAPI=4 GENTOO_DEPEND_ON_PERL="no" PYTHON_DEPEND="python? *" SUPPORT_PYTHON_ABIS="1" @@ -15,8 +15,8 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="perl python" +KEYWORDS="amd64 ~ppc ~ppc64 x86" +IUSE="perl python static-libs" DEPEND="virtual/libusb:0 >=dev-libs/libg15-1.2.4 @@ -29,8 +29,8 @@ DEPEND="virtual/libusb:0 RDEPEND="${DEPEND}" PATCHES=( -"${FILESDIR}/${P}-forgotten-open-mode.patch" -"${FILESDIR}/${P}-overflow-fix.patch" + "${FILESDIR}/${P}-forgotten-open-mode.patch" + "${FILESDIR}/${P}-overflow-fix.patch" ) uinput_check() { ebegin "Checking for uinput support" @@ -81,7 +81,8 @@ src_prepare() { src_configure() { econf \ - --disable-static + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + $(use_enable static-libs static) if use perl; then cd "${WORKDIR}/G15Daemon-0.2" @@ -90,7 +91,7 @@ src_configure() { } src_compile() { - emake || die + default if use perl; then cd "${WORKDIR}/G15Daemon-0.2" @@ -99,13 +100,12 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" \ - docdir=/usr/share/doc/${PF} install || die "make install failed" + default find "${ED}" -name '*.la' -exec rm -f {} + # remove odd docs installed my make - rm "${D}/usr/share/doc/${PF}/"{LICENSE,README.usage} + rm "${ED}/usr/share/doc/${PF}/"{LICENSE,README.usage} insinto /usr/share/${PN}/contrib doins contrib/xmodmaprc |