diff options
| author |   Michael Januszewski <spock@gentoo.org> | 2007-03-15 13:27:28 +0000 |
|---|---|---|
| committer | Michael Januszewski <spock@gentoo.org> | 2007-03-15 13:27:28 +0000 |
| commit | 2d8f9a9d6d0c3a31ca241764d68e1329e41cde1d (patch) | |
| tree | 68d11e34f0f89abbe1163ea7fb8a4d29c51eceb1 /media-gfx/splashutils | |
| parent | Remove unneeded version. (diff) | |
| download | gentoo-2-2d8f9a9d6d0c3a31ca241764d68e1329e41cde1d.tar.gz gentoo-2-2d8f9a9d6d0c3a31ca241764d68e1329e41cde1d.tar.bz2 gentoo-2-2d8f9a9d6d0c3a31ca241764d68e1329e41cde1d.zip | |
Add support for baselayout 1.13.0.
(Portage version: 2.1.2.2)
Diffstat (limited to 'media-gfx/splashutils')
| -rw-r--r-- | media-gfx/splashutils/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/splashutils/files/splashutils-1.3.1-cachedir.patch | 19 | ||||
| -rw-r--r-- | media-gfx/splashutils/splashutils-1.3.1.ebuild | 10 |
3 files changed, 32 insertions, 3 deletions
diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog index 294e34ffa3c6..d646e7be1def 100644 --- a/media-gfx/splashutils/ChangeLog +++ b/media-gfx/splashutils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/splashutils # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.76 2007/03/14 23:02:25 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.77 2007/03/15 13:27:28 spock Exp $ + + 15 Mar 2007; Michał Januszewski <spock@gentoo.org> + +files/splashutils-1.3.1-cachedir.patch, splashutils-1.3.1.ebuild: + Add support for baselayout 1.13.0. 14 Mar 2007; Michał Januszewski <spock@gentoo.org> +files/splashutils-1.3.1-boot_message-fix.patch, splashutils-1.3.1.ebuild: diff --git a/media-gfx/splashutils/files/splashutils-1.3.1-cachedir.patch b/media-gfx/splashutils/files/splashutils-1.3.1-cachedir.patch new file mode 100644 index 000000000000..5bca5df48c24 --- /dev/null +++ b/media-gfx/splashutils/files/splashutils-1.3.1-cachedir.patch @@ -0,0 +1,19 @@ +diff --git a/gentoo/splash-functions.sh b/gentoo/splash-functions.sh +index 38216f1..c7c805e 100644 +--- a/gentoo/splash-functions.sh ++++ b/gentoo/splash-functions.sh +@@ -523,7 +523,13 @@ splash_cache_cleanup() { + # writable, update it to avoid stale mtab entries (bug #121827). + local mntopt="" + [[ -w /etc/mtab ]] || mntopt="-n" +- umount ${mntopt} -l "${spl_tmpdir}" 2>/dev/null ++ mount ${mntopt} --move "${spl_cachedir}" "${spl_tmpdir}" 2>/dev/null ++ ++ # Don't try to copy anything if the cachedir is not writable. ++ [[ -w "${spl_cachedir}" ]] || return; ++ ++ cp -a "${spl_tmpdir}"/profile "${spl_cachedir}" 2>/dev/null ++ umount -l "${spl_tmpdir}" 2>/dev/null + } + + ########################################################################### diff --git a/media-gfx/splashutils/splashutils-1.3.1.ebuild b/media-gfx/splashutils/splashutils-1.3.1.ebuild index 428dc7d665cd..7ee425d6398f 100644 --- a/media-gfx/splashutils/splashutils-1.3.1.ebuild +++ b/media-gfx/splashutils/splashutils-1.3.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.3.1.ebuild,v 1.3 2007/03/14 23:02:25 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.3.1.ebuild,v 1.4 2007/03/15 13:27:28 spock Exp $ inherit eutils multilib toolchain-funcs @@ -65,7 +65,13 @@ src_unpack() { rm ${S}/libs/zlib-${V_ZLIB}/Makefile cd ${SG} - epatch ${FILESDIR}/${GENTOOSPLASH}-old-baselayout.patch + + if has_version '>=sys-apps/baselayout-1.13.0_alpha12' ; then + epatch ${FILESDIR}/${P}-cachedir.patch + else + epatch ${FILESDIR}/${GENTOOSPLASH}-old-baselayout.patch + fi + epatch ${FILESDIR}/${P}-boot_msg.patch cd ${S} |