grobian     15/02/28 14:07:30

  Modified:             ChangeLog
  Added:                baselayout-prefix-2.2-r4.ebuild
  Log:
  Move away from einfo (bug #504284) to solve bugs #538374 and #513070
  
  (Portage version: 2.2.14-prefix/cvs/SunOS i386, signed Manifest commit with 
key 0x5F75F607C5C74E89)

Revision  Changes    Path
1.38                 sys-apps/baselayout-prefix/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog?rev=1.38&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog?rev=1.38&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog?r1=1.37&r2=1.38

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ChangeLog   12 Feb 2014 19:57:23 -0000      1.37
+++ ChangeLog   28 Feb 2015 14:07:30 -0000      1.38
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/baselayout-prefix
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog,v 1.37 
2014/02/12 19:57:23 redlizard Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog,v 1.38 
2015/02/28 14:07:30 grobian Exp $
+
+*baselayout-prefix-2.2-r4 (28 Feb 2015)
+
+  28 Feb 2015; Fabian Groffen <[email protected]>
+  +baselayout-prefix-2.2-r4.ebuild:
+  Move away from einfo (bug #504284) to solve bugs #538374 and #513070
 
   12 Feb 2014; redlizard <[email protected]> 
baselayout-prefix-2.2-r3.ebuild:
   Bump einfo version for fixes for platforms without visibility(hidden) 
support.



1.1                  sys-apps/baselayout-prefix/baselayout-prefix-2.2-r4.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r4.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r4.ebuild?rev=1.1&content-type=text/plain

Index: baselayout-prefix-2.2-r4.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r4.ebuild,v
 1.1 2015/02/28 14:07:30 grobian Exp $

EAPI=3

inherit eutils multilib libtool

MY_P=${P/-prefix/}  # just use "upstream" sources
DESCRIPTION="Minimal baselayout for Gentoo Prefix installs"
HOMEPAGE="http://www.gentoo.org/";
SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
        http://dev.gentoo.org/~vapier/dist/${MY_P}.tar.bz2";

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~arm ~arm-linux ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux 
~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris ~x86-winnt"

RDEPEND="sys-apps/gentoo-functions"
DEPEND="${RDEPEND}"

pkg_preinst() {
        # This is written in src_install (so it's in CONTENTS), but punt all
        # pending updates to avoid user having to do etc-update (and make the
        # pkg_postinst logic simpler).
        rm -f "${EROOT}"/etc/._cfg????_gentoo-release
}

src_install() {
        # make functions.sh available in /etc/init.d (from gentoo-functions)
        # Note: we cannot replace the symlink with a file here, or Portage will
        # config-protect it, and etc-update can't handle symlink to file updates
        dodir etc/init.d
        dosym ../../lib/gentoo/functions.sh /etc/init.d/functions.sh

        pushd "${WORKDIR}"/${MY_P} > /dev/null || die
        dodir etc
        sed \
                -e "/PATH=/!s:/\(etc\|usr/bin\|bin\):\"${EPREFIX}\"/\1:g" \
                -e "/PATH=/s|\([:\"]\)/|\1${EPREFIX}/|g" \
                -e "/PATH=.*\/sbin/s|\"$|:/usr/sbin:/sbin\"|" \
                -e "/PATH=.*\/bin/s|\"$|:/usr/bin:/bin\"|" \
                etc/profile > "${ED}"/etc/profile || die
        dodir etc/env.d
        sed \
                -e "s:/\(etc/env.d\|opt\|usr\):${EPREFIX}/\1:g" \
                -e "/^PATH=/s|\"$|:${EPREFIX}/usr/sbin:${EPREFIX}/sbin\"|" \
                etc/env.d/00basic > "${ED}"/etc/env.d/00basic || die
        dodoc ChangeLog.svn
        popd > /dev/null

        # add the host OS MANPATH
        if [[ -d "${ROOT}"/usr/share/man ]] ; then
                echo 'MANPATH="/usr/share/man"' > "${ED}"/etc/env.d/99basic || 
die
        fi

        # rc-scripts version for testing of features that *should* be present
        echo "Gentoo Prefix Base System release ${PV}" > 
"${ED}"/etc/gentoo-release

        # FHS compatibility symlinks stuff
        dosym /var/tmp /usr/tmp

        # add a dummy to avoid Portage shebang errors
        dodir sbin
        cat > "${ED}"/sbin/runscript <<- EOF
                #!/usr/bin/env sh
                source "${EPREFIX}/lib/gentoo/functions.sh"

                eerror "runscript not supported by Gentoo Prefix Base System 
release ${PV}" 1>&2
                exit 1
        EOF
        chmod 755 "${ED}"/sbin/runscript || die
}

pkg_postinst() {
        # Take care of the etc-update for the user
        if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then
                mv "${EROOT}"/etc/._cfg0000_gentoo-release 
"${EROOT}"/etc/gentoo-release
        fi

        # baselayout leaves behind a lot of .keep files, so let's clean them up
        find "${EROOT}"/lib/rcscripts/ -name .keep -exec rm -f {} + 2>/dev/null
        find "${EROOT}"/lib/rcscripts/ -depth -type d -exec rmdir {} + 
2>/dev/null
}




Reply via email to