diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2014-10-15 15:09:20 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2014-10-15 15:09:20 +0000 |
| commit | 3017e521a2328040be51c8486ff3717019d8923c (patch) | |
| tree | c0f48e632ad2a9872cdfeac3741d6b6bef8e4753 /www-plugins | |
| parent | Version bump. Remove old. (diff) | |
| download | gentoo-2-3017e521a2328040be51c8486ff3717019d8923c.tar.gz gentoo-2-3017e521a2328040be51c8486ff3717019d8923c.tar.bz2 gentoo-2-3017e521a2328040be51c8486ff3717019d8923c.zip | |
Support multilib providers for deps. Bump to EAPI=5.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'www-plugins')
| -rw-r--r-- | www-plugins/nspluginwrapper/ChangeLog | 8 | ||||
| -rw-r--r-- | www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild | 31 |
2 files changed, 25 insertions, 14 deletions
diff --git a/www-plugins/nspluginwrapper/ChangeLog b/www-plugins/nspluginwrapper/ChangeLog index 4e0757368433..1c76f0376210 100644 --- a/www-plugins/nspluginwrapper/ChangeLog +++ b/www-plugins/nspluginwrapper/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-plugins/nspluginwrapper -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.28 2012/08/04 09:44:23 ago Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.29 2014/10/15 15:09:20 pacho Exp $ + + 15 Oct 2014; Pacho Ramos <pacho@gentoo.org> nspluginwrapper-1.4.4-r3.ebuild: + Support multilib providers for deps. Bump to EAPI=5. 04 Aug 2012; Agostino Sarubbo <ago@gentoo.org> nspluginwrapper-1.4.4-r3.ebuild: @@ -330,4 +333,3 @@ <herbs@gentoo.org>, also had contributions from Ahmed Ammar <b33fc0d3@gmail.com> and Matsuu Takuto matsuu@gentoo.org. Closes bug #138454. - diff --git a/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild index afe8c809c91b..2a13006a276d 100644 --- a/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild +++ b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild,v 1.3 2012/08/04 09:44:23 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild,v 1.4 2014/10/15 15:09:20 pacho Exp $ -EAPI=2 +EAPI=5 inherit eutils multilib nsplugins flag-o-matic toolchain-funcs @@ -17,9 +17,19 @@ IUSE="" RDEPEND=">=x11-libs/gtk+-2:2 net-misc/curl - app-emulation/emul-linux-x86-xlibs - app-emulation/emul-linux-x86-gtklibs - >=sys-apps/util-linux-2.13" + >=sys-apps/util-linux-2.13 + || ( + ( + >=dev-libs/glib-2.34.3[abi_x86_32(-)] + >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] + >=x11-libs/libX11-1.6.2[abi_x86_32(-)] + >=x11-libs/libXt-1.1.4[abi_x86_32(-)] + ) + ( + app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] + ) + )" DEPEND="${RDEPEND} virtual/pkgconfig" @@ -72,16 +82,15 @@ src_configure() { } src_compile() { - emake LDFLAGS_32="-m32 ${LDFLAGS}" || die "emake failed" + emake LDFLAGS_32="$(get_abi_CFLAGS x86) ${LDFLAGS}" } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install - dosym "/usr/$(get_libdir)/${PN}/x86_64/linux/npconfig" "/usr/bin/${PN}" \ - || die "dosym failed" + dosym "/usr/$(get_libdir)/${PN}/x86_64/linux/npconfig" "/usr/bin/${PN}" - keepdir "/usr/$(get_libdir)/${PLUGINS_DIR}" || die "keepdir failed" + keepdir "/usr/$(get_libdir)/${PLUGINS_DIR}" dodoc NEWS README TODO } |