diff options
Diffstat (limited to 'sys-apps/baselayout')
| -rw-r--r-- | sys-apps/baselayout/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/baselayout/Manifest | 10 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-2.0.0.ebuild | 112 |
3 files changed, 124 insertions, 5 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index d7d96170e041..10162ec7be51 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,15 @@ # ChangeLog for sys-apps/baselayout # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.460 2008/03/11 00:00:47 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.461 2008/03/23 01:42:29 vapier Exp $ # See the rc-scripts ChangeLog in subversion for release info: # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog +*baselayout-2.0.0 (23 Mar 2008) + + 23 Mar 2008; Mike Frysinger <vapier@gentoo.org> +baselayout-2.0.0.ebuild: + Version bump #212696. + 11 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> baselayout-1.11.15-r3.ebuild, baselayout-1.12.10-r5.ebuild, baselayout-1.12.11.ebuild, baselayout-1.12.11.1.ebuild: diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index d16c2c08e3c8..1a5939108bc2 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -12,19 +12,21 @@ AUX copyright 2099 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 SHA1 3d5da783 DIST baselayout-1.12.10.tar.bz2 218940 RMD160 e499c08af4d73d43c2e354febbf09e48916ac24c SHA1 306090e733eaf059d0849291d6327f7ea9bae5cc SHA256 1d64cdb9cc42bca7a8eec4045ad0e7e8cafba1d6c3f92b377bc7f6f7ee668674 DIST baselayout-1.12.11.1.tar.bz2 222570 RMD160 0e9b6fca3584189f0fe3dcc8a52f0683dc84220d SHA1 6d56a00d5fe3c5a48eaa471baa5b17198fb9ef57 SHA256 5320fdf22b9d665c776eda9beeebecb30bb516bbb7cfcb128e4a1e250e66ca4c DIST baselayout-1.12.11.tar.bz2 222614 RMD160 68f3358f18da939d6c7646d80cbf94471f3a16ea SHA1 61334b0018464e007b19c223b82da6e597215878 SHA256 d06651add5e9d7e9ff8622bbdd0c503e91a18b2d12db1aa26cde77f24d308e07 +DIST baselayout-2.0.0.tar.bz2 23073 RMD160 0ce706d975635dfd3901b2065677013f35f80082 SHA1 5eb389b4ad9be5fa170df243d07b9140de1c8224 SHA256 e976ce2f37f0ee79e7c65eb77e3331d8a369ca5d74003f886c3594c206ce6ca9 DIST baselayout-2.0.0_rc6.tar.bz2 148193 RMD160 8adde70811f685aa5e294adf4037c12686f14d34 SHA1 9749a3382147c6d8e72e53fa64e6c926d19e0bf7 SHA256 0d4c06176ad8e435c88983417349e081824b6b2c387bc7a2624ce7ccb0165767 DIST rc-scripts-1.6.15.tar.bz2 161524 RMD160 f69c3d5a9e742bf7b7c997d49d443617779f3d39 SHA1 e3039dc8fe7ddfc31d88f4b9e1c833fe9607f85c SHA256 55d20018624141fa2ae92c843fa93c6d4b77fc89a493949d5ad391bce5b9888a EBUILD baselayout-1.11.15-r3.ebuild 18840 RMD160 12e51582b0226ce0ca937ccb5c72df07af089f30 SHA1 4126eeb73b5bb5890a5201c403720f1c63db326d SHA256 072ca0751f3d00cd8ccebe416490eba30017b6b3cf4d585c582219a80a940895 EBUILD baselayout-1.12.10-r5.ebuild 19499 RMD160 1581d4309e884001908a59016d4e73bf3f90df01 SHA1 ce1dc4d370ef70569b3c20d02ff709a2d7c91bd0 SHA256 2a2b43ddeb578dbabba3d15dda53951fbcdea432ef44d07ec64d6d384dc03184 EBUILD baselayout-1.12.11.1.ebuild 19460 RMD160 a3c7af10ecf98cc308e68e7a3fe13278345bfd4d SHA1 c79b3a6a109c3e48332e103433554f01faec827b SHA256 86a9b52e81c14bf998489edf663b6e4116ea8e6292664a27978bed20d66cc87c EBUILD baselayout-1.12.11.ebuild 19344 RMD160 7e3037279c11074bc9f5f9cffa4a311bdc4ab73c SHA1 73e8e4a85f90b9d00f5644a9a9212b274cbe6515 SHA256 be57d009fd26715fb45e8811cd6efa545adde7db4e3706b312865c59d89ff3d1 +EBUILD baselayout-2.0.0.ebuild 4137 RMD160 b7de342723d275aff2261a4080529d82d441b2db SHA1 b3cae515fefa574f97a4fefbf5219fe625023739 SHA256 792353f5dc3e8c749b10d116d8f6e11b0fcf27c4eac36f1765cbd1a85797f799 EBUILD baselayout-2.0.0_rc6-r1.ebuild 8657 RMD160 8cc2adb7e386b2da0ee0045159e361eadc7bb18e SHA1 f91ae1c56b99e5b485a6c0986733d1a6df441756 SHA256 210d829a4efff1495fbb472f50a57a163d843104e4f15a91971a6b27c37f9d02 -MISC ChangeLog 100063 RMD160 c1a74d54664ab57ecc90ea4e6e6d061f6a065488 SHA1 b34074cabb5fec36ab9c6e6595601e7db49adc9d SHA256 f97289a59c85b7acd6a993a8ab9b95a7f7456c12e3a1c9b3b09e32a7b9c02aac +MISC ChangeLog 100195 RMD160 f1f44d771271bacb294a5aaa08a3415ffb76b2d7 SHA1 592df646c2241a047ffdda7b8fb7b40db7f1c56f SHA256 81fa2988179772c18dee1e146831288ecef7982f1e5c30d5b861adcd55a21a5f MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFH3N4Tj9hvisErhMIRAr/mAJsEvAfyPMTp+HljTNZVNVdVDOKlCQCgu0C3 -EHBlqggmbuDJtn0lkHjSiuk= -=khci +iD8DBQFH5bYbj9hvisErhMIRAv3/AJ9Wmo5do8VrvAMX4vbqbw4wWTKdaACg2DtM +Qjan0k3r1E7jS5pkUvBtO3E= +=sb5b -----END PGP SIGNATURE----- diff --git a/sys-apps/baselayout/baselayout-2.0.0.ebuild b/sys-apps/baselayout/baselayout-2.0.0.ebuild new file mode 100644 index 000000000000..c16a24007e63 --- /dev/null +++ b/sys-apps/baselayout/baselayout-2.0.0.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.1 2008/03/23 01:42:29 vapier Exp $ + +inherit multilib + +DESCRIPTION="Filesystem baselayout and init scripts" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="mirror://gentoo/${P}.tar.bz2 + http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="build" + +PDEPEND="sys-apps/openrc" + +pkg_preinst() { + # We need to install directories and maybe some dev nodes when building + # stages, but they cannot be in CONTENTS. + # Also, we cannot reference $S as binpkg will break so we do this. + if use build ; then + local libdirs="$(get_all_libdirs)" dir= + # Create our multilib dirs - the Makefile has no knowledge of this + : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... + for dir in ${libdirs}; do + mkdir -p "${ROOT}${dir}" + touch "${ROOT}${dir}"/.keep + mkdir -p "${ROOT}usr/${dir}" + touch "${ROOT}usr/${dir}"/.keep + mkdir -p "${ROOT}usr/local/${dir}" + touch "${ROOT}usr/local/${dir}"/.keep + done + + # Ugly compatibility with stupid ebuilds and old profiles symlinks + if [ "${SYMLINK_LIB}" = "yes" ] ; then + rm -r "${ROOT}"/{lib,usr/lib,usr/local/lib} 2>/dev/null + local lib=$(get_abi_LIBDIR ${DEFAULT_ABI}) + ln -s "${lib}" "${ROOT}lib" + ln -s "${lib}" "${ROOT}usr/lib" + ln -s "${lib}" "${ROOT}usr/local/lib" + fi + + emake -C "${T}" $(make_opts) DESTDIR="${ROOT}" layout || die "failed to layout filesystem" + fi +} + +src_install() { + local libdir="lib" + [[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}") + + emake \ + OS=$(use kernel_FreeBSD && echo BSD || echo Linux) \ + LIB=${libdir} \ + DESTDIR="${D}" \ + install || die + dodoc ChangeLog + + # Should this belong in another ebuild? Like say binutils? + # List all the multilib libdirs in /etc/env/04multilib (only if they're + # actually different from the normal + if has_multilib_profile || [ $(get_libdir) != "lib" -o -n "${CONF_MULTILIBDIR}" ]; then + local libdirs="$(get_all_libdirs)" libdirs_env= dir= + : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... + for dir in ${libdirs}; do + libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir} + done + + # Special-case uglyness... For people updating from lib32 -> lib amd64 + # profiles, keep lib32 in the search path while it's around + if has_multilib_profile && [ -d "${ROOT}"lib32 -o -d "${ROOT}"lib32 ] && ! hasq lib32 ${libdirs}; then + libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32" + fi + echo "LDPATH=\"${libdirs_env}\"" > "${T}"/04multilib + doenvd "${T}"/04multilib + fi + + # rc-scripts version for testing of features that *should* be present + echo "Gentoo Base System release ${PV}" > "${D}"/etc/gentoo-release +} + +pkg_postinst() { + # We installed some files to /usr/share/baselayout instead of /etc to stop + # (1) overwriting the user's settings + # (2) screwing things up when attempting to merge files + # (3) accidentally packaging up personal files with quickpkg + # If they don't exist then we install them + for x in master.passwd passwd shadow group fstab ; do + [ -e "${ROOT}etc/${x}" ] && continue + [ -e "${ROOT}usr/share/baselayout/${x}" ] || continue + cp -p "${ROOT}usr/share/baselayout/${x}" "${ROOT}"etc + done + + # This is also written in src_install (so it's in CONTENTS), but + # write it here so that the new version is immediately in the file + # (without waiting for the user to do etc-update) + rm -f "${ROOT}"/etc/._cfg????_gentoo-release + local release="${PV}" + [ "${PR}" != r0 ] && release="${release}-${PR}" + echo "Gentoo Base System release ${release}" > "${ROOT}"/etc/gentoo-release + + # whine about users that lack passwords #193541 + if [[ -e ${ROOT}/etc/shadow ]] ; then + local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${ROOT}"/etc/shadow) + if [[ -n ${bad_users} ]] ; then + echo + ewarn "The following users lack passwords!" + ewarn ${bad_users} + fi + fi +} |