From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1MDdIM-0000GT-Uz for garchives@archives.gentoo.org; Mon, 08 Jun 2009 11:45:43 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 66F7BE039D; Mon, 8 Jun 2009 11:45:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2524BE039D for ; Mon, 8 Jun 2009 11:45:40 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id A22436558A for ; Mon, 8 Jun 2009 11:45:39 +0000 (UTC) Received: from vapier by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1MDdIJ-00038z-A6 for gentoo-commits@lists.gentoo.org; Mon, 08 Jun 2009 11:45:39 +0000 From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: ChangeLog openrc-9999.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog openrc-9999.ebuild X-VCS-Directories: sys-apps/openrc X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: Sender: Mike Frysinger Date: Mon, 08 Jun 2009 11:45:39 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 56f65ac6-20bf-490f-a82e-e706e792d50d X-Archives-Hash: 59e8f19cc95e7a167af0c914361f1657 vapier 09/06/08 11:45:39 Modified: ChangeLog openrc-9999.ebuild Log: Sync changes from 0.4.3 back and merge the live/release versions. (Portage version: 2.2_rc33/cvs/Linux x86_64) Revision Changes Path 1.71 sys-apps/openrc/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/Ch= angeLog?rev=3D1.71&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/Ch= angeLog?rev=3D1.71&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/Ch= angeLog?r1=3D1.70&r2=3D1.71 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- ChangeLog 29 May 2009 22:57:52 -0000 1.70 +++ ChangeLog 8 Jun 2009 11:45:39 -0000 1.71 @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/openrc # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.70 2009= /05/29 22:57:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.71 2009= /06/08 11:45:39 vapier Exp $ + + 08 Jun 2009; Mike Frysinger openrc-9999.ebuild: + Sync changes from 0.4.3 back and merge the live/release versions. =20 29 May 2009; Mike Frysinger openrc-9999.ebuild: Update repos to point to git #269705 by William Keaney. 1.47 sys-apps/openrc/openrc-9999.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/op= enrc-9999.ebuild?rev=3D1.47&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/op= enrc-9999.ebuild?rev=3D1.47&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/op= enrc-9999.ebuild?r1=3D1.46&r2=3D1.47 Index: openrc-9999.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- openrc-9999.ebuild 29 May 2009 22:57:52 -0000 1.46 +++ openrc-9999.ebuild 8 Jun 2009 11:45:39 -0000 1.47 @@ -1,17 +1,19 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v = 1.46 2009/05/29 22:57:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v = 1.47 2009/06/08 11:45:39 vapier Exp $ =20 inherit eutils flag-o-matic multilib toolchain-funcs =20 if [[ ${PV} =3D=3D "9999" ]] ; then EGIT_REPO_URI=3D"git://roy.marples.name/openrc.git" inherit git + KEYWORDS=3D"" else SRC_URI=3D"http://roy.marples.name/downloads/${PN}/${P}.tar.bz2 mirror://gentoo/${P}.tar.bz2 http://dev.gentoo.org/~cardoe/files/${P}.tar.bz2 http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2" + KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s39= 0 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" fi =20 DESCRIPTION=3D"OpenRC manages the services, startup and shutdown of a ho= st" @@ -19,7 +21,6 @@ =20 LICENSE=3D"BSD-2" SLOT=3D"0" -KEYWORDS=3D"" IUSE=3D"debug elibc_glibc ncurses pam unicode kernel_linux kernel_FreeBS= D" =20 RDEPEND=3D"virtual/init @@ -35,10 +36,9 @@ virtual/os-headers" =20 pkg_setup() { - LIBDIR=3D"lib" - [ "${SYMLINK_LIB}" =3D "yes" ] && LIBDIR=3D$(get_abi_LIBDIR "${DEFAULT_= ABI}") + unset LIBDIR #266688 =20 - MAKE_ARGS=3D"${MAKE_ARGS} LIBNAME=3D${LIBDIR}" + MAKE_ARGS=3D"${MAKE_ARGS} LIBNAME=3D$(get_libdir)" =20 local brand=3D"Unknown" if use kernel_linux ; then @@ -62,6 +62,7 @@ unpack ${A} fi cd "${S}" + sed -i 's:0444:0644:' mk/sys.mk epatch "${FILESDIR}"/9999/*.patch } =20 @@ -77,17 +78,21 @@ fi =20 tc-export CC AR RANLIB - echo emake ${MAKE_ARGS} emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed" } =20 src_install() { - emake ${MAKE_ARGS} DESTDIR=3D"${D}" install || die "make install failed= " + emake ${MAKE_ARGS} DESTDIR=3D"${D}" install || die + + # move the shared libs back to /usr so ldscript can install + # more of a minimal set of files + # disabled for now due to #270646 + #mv "${D}"/$(get_libdir)/lib{einfo,rc}* "${D}"/usr/$(get_libdir)/ || di= e + #gen_usr_ldscript -a einfo rc gen_usr_ldscript libeinfo.so gen_usr_ldscript librc.so =20 - keepdir /"${LIBDIR}"/rc/init.d - keepdir /"${LIBDIR}"/rc/tmp + keepdir /$(get_libdir)/rc/{init.d,tmp} =20 # Backup our default runlevels dodir /usr/share/"${PN}"