diff options
author | 2009-05-09 20:27:37 +0000 | |
---|---|---|
committer | 2009-05-09 20:27:37 +0000 | |
commit | df7243e9b398ce248b58cbb9967cd85a1a860636 (patch) | |
tree | 2780f0ac396c0b42f0cebc8f034f2ec5f079a49e /sys-apps | |
parent | Fix some QA issues (diff) | |
download | historical-df7243e9b398ce248b58cbb9967cd85a1a860636.tar.gz historical-df7243e9b398ce248b58cbb9967cd85a1a860636.tar.bz2 historical-df7243e9b398ce248b58cbb9967cd85a1a860636.zip |
Remove LIBDIR from env #266688, switch to get_libdir, and install shared libs better with gen_usr_ldscript. Also install files with 644 rather than 444.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/openrc/ChangeLog | 7 | ||||
-rw-r--r-- | sys-apps/openrc/Manifest | 10 | ||||
-rw-r--r-- | sys-apps/openrc/openrc-0.4.3-r2.ebuild | 21 |
3 files changed, 22 insertions, 16 deletions
diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog index 001d8003e64f..d3e7d2d1da11 100644 --- a/sys-apps/openrc/ChangeLog +++ b/sys-apps/openrc/ChangeLog @@ -1,6 +1,11 @@ # 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.68 2009/04/27 04:55:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.69 2009/05/09 20:27:37 vapier Exp $ + + 09 May 2009; Mike Frysinger <vapier@gentoo.org> openrc-0.4.3-r2.ebuild: + Remove LIBDIR from env #266688, switch to get_libdir, and install shared + libs better with gen_usr_ldscript. Also install files with 644 rather than + 444. 27 Apr 2009; Mike Frysinger <vapier@gentoo.org> files/9999/0001-msg-style.patch, files/9999/0002-useful-functions.patch, diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index b9ab793ee6a1..b68f7fac8fa1 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -21,14 +21,14 @@ DIST openrc-0.4.3.tar.bz2 145668 RMD160 9e517cb492651c5fc5f90ba1b52d42238cd239ad EBUILD openrc-0.4.1-r1.ebuild 10257 RMD160 09b1f0ef469dadb4db344e87f5695cbf40a487cc SHA1 e4294348c3540c3b5bdf779ade99b08aa45074f7 SHA256 eb90bb18cd80ff2449f2071f829cb1a672059320b03d81543d8133ca85588315 EBUILD openrc-0.4.2.ebuild 10228 RMD160 769c35cd085c3b45d722321c1d13d35b8c4c7283 SHA1 111aa2392d965846dc9ddf1c535010eec1524ed0 SHA256 b17d081ec30ae557bf5d2664b25e51f1b0425f08d4d8eba932c5a33672555681 EBUILD openrc-0.4.3-r1.ebuild 10401 RMD160 441494782af660a954102d347411d0905d9f2520 SHA1 7826444c7fafd4a20f0feca79449e1fc5dc7f8ed SHA256 8bb06d5f79a3010b2060a75ef7770cd95baf71c6be9c59cda7e7288531c5fa06 -EBUILD openrc-0.4.3-r2.ebuild 10462 RMD160 859a50cfa5df320b39caaa6f6436d868850f85f5 SHA1 c86ce35a213a258f9000c26e8b0b741c8ca1d5de SHA256 137c15b63436629b95dff971fc41bfc80c37fbc75d8b6a1df763b6127f8f7a32 +EBUILD openrc-0.4.3-r2.ebuild 10506 RMD160 c40c436722dea4f7440b9e472b7682359302dce3 SHA1 81d262d3dbcdc9dfbeb2979b73f98fa7136eb5f3 SHA256 d3faed5dd4ad8fdf3222733cef1be7b4391c7980f05478bbff4cf6e11835a574 EBUILD openrc-9999.ebuild 10129 RMD160 8a832f78324e5d6c72c31dbfcf86b0da2732802b SHA1 00a8eb5b146e24fc0b8ffb8b374cb2d631ad0d2d SHA256 0f2dc2caf6471ee98530b1dd038c2656be660c2d413fc346241bd5f343ace4b7 -MISC ChangeLog 14183 RMD160 0e6bdc6e404ce127dacd5ef170b1ffc628542689 SHA1 34b704d0f534f188357e96ca1e975d6d87ebc731 SHA256 cf68a21ab43122c175320060b496d6e2f0c3ff7240ef3e0bf50a12fcfe3429cc +MISC ChangeLog 14417 RMD160 f677f08314d7e51620d34f797f23a07df271e88f SHA1 0c55050886ad2294791913b1bff8baa4caeb6d0a SHA256 3678045bfdde2ea5a6f36c89a4aee71c51d567dfe5f37df4463ea645f76f8cfd MISC metadata.xml 314 RMD160 ff92ab9cd3f1f3caf25d0be59cf658343d44991c SHA1 d9febb1ce1499c949a2478defda945a3ce716f73 SHA256 4eb82a61b3697027b5ccb1a328a763308c7e090aa23f69fe87b7b7966165fb33 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkn1OqkACgkQn/5bYzqsSmEPQgCfZdxOdz0uWKujlvAf2RSBzBYS -6J8AoJRuqPIjGlkeXES7DmDiJaMOOvL8 -=COFF +iEYEARECAAYFAkoF5z8ACgkQn/5bYzqsSmFvJQCgkV2wcUNqbq/QueqUUPehxB7I +JVIAn1XYs/aNPzaSd+FKdYeFvKaRspCU +=Pavm -----END PGP SIGNATURE----- diff --git a/sys-apps/openrc/openrc-0.4.3-r2.ebuild b/sys-apps/openrc/openrc-0.4.3-r2.ebuild index 427a5e8f1d48..b7910128c94b 100644 --- a/sys-apps/openrc/openrc-0.4.3-r2.ebuild +++ b/sys-apps/openrc/openrc-0.4.3-r2.ebuild @@ -1,6 +1,6 @@ # 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-0.4.3-r2.ebuild,v 1.1 2009/04/18 10:40:17 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.4.3-r2.ebuild,v 1.2 2009/05/09 20:27:37 vapier Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -35,10 +35,9 @@ DEPEND="${RDEPEND} virtual/os-headers" pkg_setup() { - LIBDIR="lib" - [ "${SYMLINK_LIB}" = "yes" ] && LIBDIR=$(get_abi_LIBDIR "${DEFAULT_ABI}") + unset LIBDIR #266688 - MAKE_ARGS="${MAKE_ARGS} LIBNAME=${LIBDIR}" + MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir)" local brand="Unknown" if use kernel_linux ; then @@ -62,6 +61,7 @@ src_unpack() { unpack ${A} fi cd "${S}" + sed -i 's:0444:0644:' mk/sys.mk epatch "${FILESDIR}"/0.4.2/0001-msg-style.patch epatch "${FILESDIR}"/0.4.2/0002-useful-functions.patch epatch "${FILESDIR}"/0.4.2/0003-KV.patch @@ -81,17 +81,18 @@ src_compile() { fi tc-export CC AR RANLIB - echo emake ${MAKE_ARGS} emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed" } src_install() { - emake ${MAKE_ARGS} DESTDIR="${D}" install || die "make install failed" - gen_usr_ldscript libeinfo.so - gen_usr_ldscript librc.so + emake ${MAKE_ARGS} DESTDIR="${D}" install || die - keepdir /"${LIBDIR}"/rc/init.d - keepdir /"${LIBDIR}"/rc/tmp + # move the shared libs back to /usr so ldscript can install + # more of a minimal set of files + mv "${D}"/$(get_libdir)/lib{einfo,rc}* "${D}"/usr/$(get_libdir)/ || die + gen_usr_ldscript -a einfo rc + + keepdir /$(get_libdir)/rc/{init.d,tmp} # Backup our default runlevels dodir /usr/share/"${PN}" |