Changeset 1586 in MondoRescue

Timestamp:

Aug 1, 2007, 1:02:29 PM (18 years ago)

Author:

Bruno Cornec

Message:

Fix gentoo issues again (Francesco Talamona ti.liame_at_email.it)

Location:

branches/2.2.5

Files:

• mindi-busybox/distributions/gentoo/mindi-busybox.ebuild (modified) (1 diff)
• mindi/distributions/gentoo/mindi.ebuild (modified) (1 diff)
• mindi/rootfs/etc/ld.so.conf (modified) (1 diff)
• mondo/distributions/gentoo/mondo-rescue.ebuild (moved) (moved from branches/2.2.5/mondo/distributions/gentoo/mondo.ebuild ) (2 diffs)
• tools/build2pkg (modified) (2 diffs)

branches/2.2.5/mindi-busybox/distributions/gentoo/mindi-busybox.ebuild

@@ -10 +10 @@
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ia64 -*"
+KEYWORDS="~x86 ~ia64 ~amd64 -*"
 DEPEND="virtual/libc"
 RDEPEND=">=app-arch/bzip2-0.9

branches/2.2.5/mindi/distributions/gentoo/mindi.ebuild

@@ -11 +11 @@
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ia64 -*"
+KEYWORDS="~x86 ~ia64 ~amd64 -*"
 IUSE=""
 

branches/2.2.5/mindi/rootfs/etc/ld.so.conf

@@ -12 +12 @@
 /usr/emu/lib
 /usr/jvm/lib
+/lib32
+/usr/lib32
 /lib64
 /usr/lib64

branches/2.2.5/mondo/distributions/gentoo/mondo-rescue.ebuild

@@ -13 +13 @@
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ia64 -*"
+KEYWORDS="~x86 ~ia64 ~amd64 -*"
 IUSE=""
 
@@ -24 +24 @@
     >=app-arch/bzip2-0.9
     app-cdr/cdrtools
-    >=sys-apps/mindi-1.2.3
+    >=sys-apps/mindi-1.2.4
     >=dev-libs/newt-0.50
     >=sys-libs/slang-1.4.1

branches/2.2.5/tools/build2pkg

@@ -96 +96 @@
         cd ..
     elif [  _"$dtype" = _"ebuild" ]; then
-        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$p-${PVER}.ebuild
+        if [ _"$p" = _"mondo" ]; then
+            eb="mondo-rescue"
+        else
+            eb=$p
+        fi
+        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$eb-${PVER}.ebuild
         if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
             echo "Adding $TOPBUILDDIR/portage to /etc/make.conf"
@@ -102 +107 @@
         fi
 
-        mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$p
-        mv $p-${PVER}/distributions/${ddir}-$dver/$p-${PVER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p/$p-${PVER}.ebuild
+        mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$eb
+        mv $p-${PVER}/distributions/${ddir}-$dver/$eb-${PVER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p/$eb-${PVER}.ebuild
         rm -rf $p-${PVER}
 
-        cd ${TOPBUILDDIR}/portage/sys-apps/$p
-        ebuild $p-${PVER}.ebuild digest
+        cd ${TOPBUILDDIR}/portage/sys-apps/$eb
+        ebuild $eb-${PVER}.ebuild digest
         if [ $? != 0 ]; then 
             status=-1
         fi
-        ebuild $p-${PVER}.ebuild package
+        ebuild $eb-${PVER}.ebuild package
         if [ $? != 0 ]; then 
             status=-1
         fi
-        export pkg="$pkg $p-${PVER}.ebuild"
+        export pkg="$pkg $eb-${PVER}.ebuild"
     elif [  _"$dtype" = _"deb" ]; then
         cd $TOPBUILDDIR