diff options
author | Patrick Kursawe <phosphan@gentoo.org> | 2010-08-26 19:24:36 +0000 |
---|---|---|
committer | Patrick Kursawe <phosphan@gentoo.org> | 2010-08-26 19:24:36 +0000 |
commit | e1ca32ccfe7a1531cf70a14fa9bfd49accfc71d5 (patch) | |
tree | 3ba25e6989148f94df99a9890d45f09748a3f497 /x11-misc/xxkb | |
parent | Bug #334323: Add more licenses: CCPL-ShareAlike-1.0 to @FREE-DOCUMENTS, and m... (diff) | |
download | gentoo-2-e1ca32ccfe7a1531cf70a14fa9bfd49accfc71d5.tar.gz gentoo-2-e1ca32ccfe7a1531cf70a14fa9bfd49accfc71d5.tar.bz2 gentoo-2-e1ca32ccfe7a1531cf70a14fa9bfd49accfc71d5.zip |
Respects LDFLAGS now, see bug #333985. Dropped obsolete version.
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'x11-misc/xxkb')
-rw-r--r-- | x11-misc/xxkb/ChangeLog | 6 | ||||
-rw-r--r-- | x11-misc/xxkb/xxkb-1.11-r1.ebuild | 4 | ||||
-rw-r--r-- | x11-misc/xxkb/xxkb-1.11.ebuild | 44 |
3 files changed, 7 insertions, 47 deletions
diff --git a/x11-misc/xxkb/ChangeLog b/x11-misc/xxkb/ChangeLog index dde235c6a43e..3a5b3363ded0 100644 --- a/x11-misc/xxkb/ChangeLog +++ b/x11-misc/xxkb/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/xxkb # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/ChangeLog,v 1.15 2010/04/08 20:17:02 phosphan Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/ChangeLog,v 1.16 2010/08/26 19:24:36 phosphan Exp $ + + 26 Aug 2010; Patrick Kursawe <phosphan@gentoo.org> -xxkb-1.11.ebuild, + xxkb-1.11-r1.ebuild: + Respects LDFLAGS now, see bug #333985. Dropped obsolete version. *xxkb-1.11-r1 (08 Apr 2010) diff --git a/x11-misc/xxkb/xxkb-1.11-r1.ebuild b/x11-misc/xxkb/xxkb-1.11-r1.ebuild index 922b1ce2453a..5773b5df21bf 100644 --- a/x11-misc/xxkb/xxkb-1.11-r1.ebuild +++ b/x11-misc/xxkb/xxkb-1.11-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/xxkb-1.11-r1.ebuild,v 1.1 2010/04/08 20:17:02 phosphan Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/xxkb-1.11-r1.ebuild,v 1.2 2010/08/26 19:24:36 phosphan Exp $ inherit eutils @@ -39,7 +39,7 @@ src_compile() { use svg && myconf="-DWITH_SVG_SUPPORT" xmkmf ${myconf} || die "xmkmf failed." emake CDEBUGFLAGS="${CFLAGS}" EXTRA_LIBRARIES="-lXext" PROJECTROOT=/usr \ - PIXMAPDIR=/usr/share/xxkb || die "emake failed." + PIXMAPDIR=/usr/share/xxkb LOCAL_LDFLAGS="${LDFLAGS}" || die "emake failed." } src_install() { diff --git a/x11-misc/xxkb/xxkb-1.11.ebuild b/x11-misc/xxkb/xxkb-1.11.ebuild deleted file mode 100644 index 2111ae45c8d5..000000000000 --- a/x11-misc/xxkb/xxkb-1.11.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/xxkb-1.11.ebuild,v 1.2 2010/04/08 20:17:02 phosphan Exp $ - -inherit eutils - -DESCRIPTION="eXtended XKB - assign different keymaps to different windows" -HOMEPAGE="http://sourceforge.net/projects/xxkb/" -SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz" - -LICENSE="Artistic" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="svg" - -RDEPEND="x11-libs/libX11 - x11-libs/libXt - x11-libs/libXpm - svg? ( >=dev-libs/glib-2 - >=x11-libs/gtk+-2 - gnome-base/librsvg )" -DEPEND="${RDEPEND} - app-text/rman - x11-misc/imake - svg? ( dev-util/pkgconfig )" - -S=${WORKDIR}/${PN} - -src_compile() { - local myconf - use svg && myconf="-DWITH_SVG_SUPPORT" - xmkmf ${myconf} || die "xmkmf failed." - emake EXTRA_LIBRARIES="-lXext" PROJECTROOT=/usr PIXMAPDIR=/usr/share/xxkb || die "emake failed." -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - emake DESTDIR="${D}" install.man || die "emake install.man failed" - - insinto /usr/share/xxkb - doins "${FILESDIR}"/*.xpm - - dodoc README* CHANGES* -} |