pacho 14/10/15 15:09:20 Modified: nspluginwrapper-1.4.4-r3.ebuild ChangeLog Log: Support multilib providers for deps. Bump to EAPI=5. (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Revision Changes Path 1.4 www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild?r1=1.3&r2=1.4 Index: nspluginwrapper-1.4.4-r3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nspluginwrapper-1.4.4-r3.ebuild 4 Aug 2012 09:44:23 -0000 1.3 +++ nspluginwrapper-1.4.4-r3.ebuild 15 Oct 2014 15:09:20 -0000 1.4 @@ -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 @@ 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_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 } 1.29 www-plugins/nspluginwrapper/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog?rev=1.29&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog?rev=1.29&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog?r1=1.28&r2=1.29 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- ChangeLog 4 Aug 2012 09:44:23 -0000 1.28 +++ ChangeLog 15 Oct 2014 15:09:20 -0000 1.29 @@ -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 <[email protected]> nspluginwrapper-1.4.4-r3.ebuild: + Support multilib providers for deps. Bump to EAPI=5. 04 Aug 2012; Agostino Sarubbo <[email protected]> nspluginwrapper-1.4.4-r3.ebuild: @@ -330,4 +333,3 @@ <[email protected]>, also had contributions from Ahmed Ammar <[email protected]> and Matsuu Takuto [email protected]. Closes bug #138454. -
