Moving -r11 back to unstable.

5 files changed, 22 insertions, 11 deletions

diff --git a/media-gfx/bootsplash/ChangeLog b/media-gfx/bootsplash/ChangeLog
index e2dd4a5d8e37..964ea37b1f26 100644
--- a/media-gfx/bootsplash/ChangeLog
+++ b/media-gfx/bootsplash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/bootsplash 
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/ChangeLog,v 1.31 2004/03/27 19:20:38 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/ChangeLog,v 1.32 2004/03/28 09:41:01 spock Exp $
+
+  28 Mar 2004; Michal Januszewski <spock@gentoo.org>
+  bootsplash-0.6-r10.ebuild, bootsplash-0.6-r11.ebuild,
+  bootsplash-0.6-r12.ebuild:
+  Marked -r11 as unstable due to a dependency on a basalayout version which is
+  still in ~x86. Backported a little fix to -r10. This closes #45924.
 
   27 Mar 2004; Michal Januszewski <spock@gentoo.org>
   bootsplash-0.6-r10.ebuild, bootsplash-0.6-r11.ebuild,
diff --git a/media-gfx/bootsplash/Manifest b/media-gfx/bootsplash/Manifest
index f0a70d950ee0..2e626046d598 100644
--- a/media-gfx/bootsplash/Manifest
+++ b/media-gfx/bootsplash/Manifest
@@ -1,11 +1,11 @@
 MD5 2a7b7643f0b181755904084cbb3bf487 bootsplash-0.6-r8.ebuild 5177
 MD5 612c9bb235cfcaa6e9e8322da314c116 bootsplash-0.6-r3.ebuild 3441
-MD5 cdc0f0d2e035de0a01cdf86419cf13b3 bootsplash-0.6-r11.ebuild 5865
-MD5 df05313cf7325669c3ef1ea007d8c9e8 bootsplash-0.6-r10.ebuild 5450
+MD5 e66cc69b6cc2040d49276d5cf9b53c89 bootsplash-0.6-r11.ebuild 5901
+MD5 32efbf4097f44af7210571938dbe382d bootsplash-0.6-r10.ebuild 5588
 MD5 149e3527061e066cb54c34d7592ba581 bootsplash-0.6-r9.ebuild 5022
-MD5 730b2e42ac4000b032dee0cd792a34ef ChangeLog 5850
+MD5 a1de7afb0f7b2de00fba90227dd5c913 ChangeLog 6138
 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
-MD5 1b419e3e75c8068f42445de1a226d8ae bootsplash-0.6-r12.ebuild 6353
+MD5 fa6cf5f49d5460e8a8ad48bdd9c0048b bootsplash-0.6-r12.ebuild 6388
 MD5 250d9fd431815e7ee0ebdad859d9796a files/digest-bootsplash-0.6-r3 70
 MD5 6a993c12a7aad0735a4783e1f7c2c968 files/digest-bootsplash-0.6-r8 70
 MD5 80d57c4a370abbf5613da61aabfca6a7 files/digest-bootsplash-0.6-r9 70
diff --git a/media-gfx/bootsplash/bootsplash-0.6-r10.ebuild b/media-gfx/bootsplash/bootsplash-0.6-r10.ebuild
index 9c691df75921..a96361adbd47 100644
--- a/media-gfx/bootsplash/bootsplash-0.6-r10.ebuild
+++ b/media-gfx/bootsplash/bootsplash-0.6-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/bootsplash-0.6-r10.ebuild,v 1.3 2004/03/27 19:20:38 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/bootsplash-0.6-r10.ebuild,v 1.4 2004/03/28 09:41:01 spock Exp $
 
 IUSE=""
 S=${WORKDIR}/${PF}
@@ -21,6 +21,9 @@ src_compile() {
 	# animated boot up require patches to the baselayout package
 	cd ${S}/utils
 
+	# a quick'n'dirty fix backported from -r11
+	sed -i 's#\$(LIBDIR)/libmng.a#\$(LIBDIR)/libmng.a \$(LIBDIR)/liblcms.a#' fbmngplay/Makefile
+
 	emake -C fbmngplay || die
 	emake -C fbtruetype || die
 	emake -C splashutils || die
diff --git a/media-gfx/bootsplash/bootsplash-0.6-r11.ebuild b/media-gfx/bootsplash/bootsplash-0.6-r11.ebuild
index f3d73344e7a3..333d7d11fcfe 100644
--- a/media-gfx/bootsplash/bootsplash-0.6-r11.ebuild
+++ b/media-gfx/bootsplash/bootsplash-0.6-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/bootsplash-0.6-r11.ebuild,v 1.4 2004/03/27 19:20:38 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/bootsplash-0.6-r11.ebuild,v 1.5 2004/03/28 09:41:01 spock Exp $
 
 IUSE=""
 S=${WORKDIR}/${PF}
@@ -10,10 +10,11 @@ SRC_URI="http://dev.gentoo.org/~spock/portage/distfiles/${PF}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~amd64 ~ppc"
+KEYWORDS="~x86 ~amd64 ~ppc"
 
 DEPEND=">=media-libs/freetype-2
-	media-libs/libmng"
+	media-libs/libmng
+	>=sys-apps/baselayout-1.8.6.13-r1"
 
 src_compile() {
 	# compile utils
diff --git a/media-gfx/bootsplash/bootsplash-0.6-r12.ebuild b/media-gfx/bootsplash/bootsplash-0.6-r12.ebuild
index 4c4ae6d3640f..33ed73bc8b15 100644
--- a/media-gfx/bootsplash/bootsplash-0.6-r12.ebuild
+++ b/media-gfx/bootsplash/bootsplash-0.6-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/bootsplash-0.6-r12.ebuild,v 1.3 2004/03/27 19:20:38 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/bootsplash-0.6-r12.ebuild,v 1.4 2004/03/28 09:41:01 spock Exp $
 
 IUSE=""
 S=${WORKDIR}/${PF}
@@ -13,7 +13,8 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64 ~ppc"
 
 DEPEND=">=media-libs/freetype-2
-	media-libs/libmng"
+	media-libs/libmng
+	>=sys-apps/baselayout-1.8.6.13-r1"
 
 src_compile() {
 	# compile utils