ottxor 14/09/26 20:43:33 Modified: charm-6.6.0.ebuild ChangeLog Log: clean up install (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key C2000586)
Revision Changes Path 1.2 sys-cluster/charm/charm-6.6.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/charm/charm-6.6.0.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/charm/charm-6.6.0.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/charm/charm-6.6.0.ebuild?r1=1.1&r2=1.2 Index: charm-6.6.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.6.0.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- charm-6.6.0.ebuild 26 Sep 2014 19:04:03 -0000 1.1 +++ charm-6.6.0.ebuild 26 Sep 2014 20:43:32 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.6.0.ebuild,v 1.1 2014/09/26 19:04:03 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.6.0.ebuild,v 1.2 2014/09/26 20:43:32 ottxor Exp $ EAPI=5 @@ -166,23 +166,13 @@ doins "${i}" done - # Install static libs. Charm has a lot of .o "libs" that it requires at - # runtime. - if use static-libs; then - for i in lib/*.{a,o}; do - if [[ -L ${i} ]]; then - i=$(readlink -e "${i}") || die - fi - dolib "${i}" - done - fi - - # Install shared libs. - for i in lib_so/*; do + # Install libs incl. charm objects + for i in lib*/*.{so,o,a}; do + [[ ${i} = *.a ]] && use !static-libs && continue if [[ -L ${i} ]]; then i=$(readlink -e "${i}") || die fi - dolib.so "${i}" + [[ ${i} = *.so ]] && dolib.so "${i}" || dolib "${i}" done # Basic docs. 1.42 sys-cluster/charm/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/charm/ChangeLog?rev=1.42&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/charm/ChangeLog?rev=1.42&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/charm/ChangeLog?r1=1.41&r2=1.42 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- ChangeLog 26 Sep 2014 19:04:03 -0000 1.41 +++ ChangeLog 26 Sep 2014 20:43:32 -0000 1.42 @@ -1,6 +1,9 @@ # ChangeLog for sys-cluster/charm # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.41 2014/09/26 19:04:03 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.42 2014/09/26 20:43:32 ottxor Exp $ + + 26 Sep 2014; Christoph Junghans <[email protected]> charm-6.6.0.ebuild: + clean up install *charm-6.6.0 (26 Sep 2014)
