Changeset 295 in ProjectBuilder for devel

Timestamp:

Jan 12, 2008, 2:12:45 AM (16 years ago)

Author:

Bruno Cornec

Message:

pb working for gentoo with mindi

Location:

devel/pb

Files:

• bin/pb (modified) (1 diff)
• contrib/pbsetupqemu (modified) (1 diff)

devel/pb/bin/pb

@@ -420 +420 @@
             my @ebuildfile;
             # For gentoo we need to take pb as subsystem name
-            pb_mkdir_p("$ENV{'PBBUILDDIR'}/portage/pb/$pbpkg") if (! -d "$ENV{'PBBUILDDIR'}/portage/pb/$pbpkg");
-
-            # We need to first extract the ebuild file
-            @ebuildfile = pb_extract_build_files($src,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$ENV{'PBBUILDDIR'}/portage/pb/$pbpkg");
+            # We put every apps here under sys-apps. hope it's correct
+            # We use pb's home dir in order o have a single OVERLAY line
+            my $tmpd = "$ENV{'HOME'}/portage/pb/sys-apps/$pbpkg";
+            pb_mkdir_p($tmpd) if (! -d "$tmpd");
+            pb_mkdir_p("$ENV{'HOME'}/portage/distfiles") if (! -d "$ENV{'HOME'}/portage/distfiles");
+
+            # We need to first extract the ebuild file 
+            @ebuildfile = pb_extract_build_files($src,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$tmpd");
 
             # Prepare the build env for gentoo
             my $found = 0;
-            my $pbbd = $ENV{'PBBUILDDIR'};
+            my $pbbd = $ENV{'HOME'};
             $pbbd =~ s|/|\\/|g;
-            open(MAKE,"/etc/make.conf") || die "Unable to open /etc/make.conf";
-            while (<MAKE>) {
-                $found = 1 if (/$pbbd\/portage/);
-            }
-            close(MAKE);
+            if (-r "/etc/make.conf") {
+                open(MAKE,"/etc/make.conf");
+                while (<MAKE>) {
+                    $found = 1 if (/$pbbd\/portage/);
+                }
+                close(MAKE);
+            }
             if ($found == 0) {
-                pb_system("sudo \'echo PORTDIR_OVERLAY=\"$ENV{'PBBUILDDIR'}/portage\" >> /etc/make.conf\'");
-            }
-            $found = 0;
-            open(KEYW,"/etc/portage/package.keywords") || die "Unable to open /etc/portage/package.keywords";
-            while (<KEYW>) {
-                $found = 1 if (/portage\/pb/);
-            }
-            close(KEYW);
-            if ($found == 0) {
-                pb_system("sudo \'echo portage/pb >> /etc/portage/package.keywords\'");
-            }
+                pb_system("sudo sh -c 'echo PORTDIR_OVERLAY=\"$ENV{'HOME'}/portage\" >> /etc/make.conf'");
+            }
+            #$found = 0;
+            #if (-r "/etc/portage/package.keywords") {
+            #open(KEYW,"/etc/portage/package.keywords");
+            #while (<KEYW>) {
+            #$found = 1 if (/portage\/pb/);
+            #}
+            #close(KEYW);
+            #}
+            #if ($found == 0) {
+            #pb_system("sudo sh -c \"echo portage/pb >> /etc/portage/package.keywords\"");
+            #}
 
             # Build
             foreach my $f (@ebuildfile) {
                 if ($f =~ /\.ebuild$/) {
-                    pb_system("ebuild $f digest ; ebuild $f package");
+                    move($f,"$tmpd/$pbpkg-$pbver.ebuild");
+                    pb_system("cd $tmpd ; ebuild $pbpkg-$pbver.ebuild clean ; ebuild $pbpkg-$pbver.ebuild digest ; ebuild $pbpkg-$pbver.ebuild package");
+                    # Now move it where pb expects it
+                    pb_mkdir_p("$ENV{'PBBUILDDIR'}/portage/pb/sys-apps/$pbpkg");
+                    move("$tmpd/$pbpkg-$pbver.ebuild","$ENV{'PBBUILDDIR'}/portage/pb/sys-apps/$pbpkg");
                 }
             }
-            print $LOG "ebuild file: ".Dumper(\@ebuildfile)."\n" if ($debug >= 1);
-
-            $made="$made portage/pb/$pbpkg/$pbpkg-$pbver.ebuild";
+
+            $made="$made portage/pb/sys-apps/$pbpkg/$pbpkg-$pbver.ebuild";
         } elsif ($dtype eq "slackware") {
             $made="$made build-$pbpkg/$pbpkg-$pbver-*-$pbtag.tgz";

devel/pb/contrib/pbsetupqemu

@@ -62 +62 @@
 rename("$file.new",$file);
 chmod 0640,$file;
+
+# pb has to be added to portage group on gentoo
 
 unlink "/tmp/pbkey";