--- a/src/pkg/Makefile.svr4	Tue Aug 02 11:11:53 2011 +0530
+++ b/src/pkg/Makefile.svr4	Wed Aug 03 17:49:35 2011 -0700
@@ -30,7 +30,7 @@
 SVR4_NAMES.cmd    = $(PKGMOGRIFY) -O /dev/null $(MANIFESTS:%=manifests/%) transforms/svr4-names
 SVR4_NAMES        = $(SVR4_NAMES.cmd:sh)
 
-SVR4_TEST_NAMES	  = SUNWipkg SUNWipkg-brand
+SVR4_TEST_NAMES   = SUNWipkg SUNWipkg-gui
 
 # Main SVr4 packaging target
 _svr4: $(SVR4_NAMES:%=$(PKGDEST)/svr4/%/pkgmap)

--- a/src/pkg/external_deps.pkglintrc	Tue Aug 02 11:11:53 2011 +0530
+++ b/src/pkg/external_deps.pkglintrc	Wed Aug 03 17:49:35 2011 -0700
@@ -57,6 +57,7 @@
     pkg:/system/linker
     pkg:/system/network
     pkg:/system/zones
+    pkg:/system/zones/brand/solaris
     pkg:/system/zones/internal
     pkg:/text/gnu-grep
     pkg:/text/tidy

--- a/src/pkg/manifests/SUNWipkg-brand.p5m	Tue Aug 02 11:11:53 2011 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
-set name=pkg.renamed value=true
-set name=nopublish.after value=133
-depend type=require fmri=system/zones/brand/[email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/tests/distro-import/data/common/package:pkg:package-manager	Wed Aug 03 17:49:35 2011 -0700
@@ -0,0 +1,12 @@
+package package/pkg/package-manager
+consolidation "ips"
+classification "System/Packaging"
+import SUNWipkg-gui
+depend package/pkg
+end package
+
+package SUNWipkg-gui
+consolidation "ips"
+renamed 133
+depend package/pkg/package-manager
+end package

--- a/src/tests/distro-import/data/common/system:zones:brand:ipkg	Tue Aug 02 11:11:53 2011 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-package system/zones/brand/ipkg
-consolidation "ips"
-classification "System/Packaging"
-import SUNWipkg-brand
-depend package/pkg
-
-chattr etc/brand/ipkg/pkgrm.conf \
-	original_name=SUNWipkg-brand:etc/brand/ipkg/pkgrm.conf
-chattr etc/brand/ipkg/smf_disable.conf \
-	original_name=SUNWipkg-brand:etc/brand/ipkg/smf_disable.conf
-end package
-
-package SUNWipkg-brand
-consolidation "ips"
-renamed 133
-depend system/zones/brand/ipkg
-end package

--- a/src/tests/distro-import/data/pkg5test_cluster	Tue Aug 02 11:11:53 2011 +0530
+++ b/src/tests/distro-import/data/pkg5test_cluster	Wed Aug 03 17:49:35 2011 -0700
@@ -1,4 +1,4 @@
-include common/system:zones:brand:ipkg
+include common/package:pkg:package-manager
 include common/package:pkg
 include common/package:varianted_actions
 package pkg5test_install
@@ -6,6 +6,6 @@
 cluster pkg5test_install
 description "pkg5test install cluster"
 version 0.1
-depend system/zones/brand/ipkg
+depend package/pkg/package-manager
 depend package/pkg
 end package

--- a/src/tests/distro-import/data/pkg5test_dup_actions_cluster	Tue Aug 02 11:11:53 2011 +0530
+++ b/src/tests/distro-import/data/pkg5test_dup_actions_cluster	Wed Aug 03 17:49:35 2011 -0700
@@ -1,4 +1,4 @@
-include common/system:zones:brand:ipkg
+include common/package:pkg:package-manager
 include common/package:pkg
 include common/package:dup_actions
 package pkg5test_install
@@ -6,6 +6,6 @@
 cluster pkg5test_install
 description "pkg5test install cluster"
 version 0.1
-depend system/zones/brand/ipkg
+depend package/pkg/package-manager
 depend package/pkg
 end package

--- a/src/tests/distro-import/data/pkg5test_dup_dirattr_cluster	Tue Aug 02 11:11:53 2011 +0530
+++ b/src/tests/distro-import/data/pkg5test_dup_dirattr_cluster	Wed Aug 03 17:49:35 2011 -0700
@@ -1,4 +1,4 @@
-include common/system:zones:brand:ipkg
+include common/package:pkg:package-manager
 include common/package:pkg
 include common/package:dup_variants
 package pkg5test_install
@@ -6,6 +6,6 @@
 cluster pkg5test_install
 description "pkg5test install cluster"
 version 0.1
-depend system/zones/brand/ipkg
+depend package/pkg/package-manager
 depend package/pkg
 end package

--- a/src/tests/distro-import/data/pkg5test_dup_variants_cluster	Tue Aug 02 11:11:53 2011 +0530
+++ b/src/tests/distro-import/data/pkg5test_dup_variants_cluster	Wed Aug 03 17:49:35 2011 -0700
@@ -1,4 +1,4 @@
-include common/system:zones:brand:ipkg
+include common/package:pkg:package-manager
 include common/package:pkg
 include common/package:dup_variants
 package pkg5test_install
@@ -6,6 +6,6 @@
 cluster pkg5test_install
 description "pkg5test install cluster"
 version 0.1
-depend system/zones/brand/ipkg
+depend package/pkg/package-manager
 depend package/pkg
 end package

--- a/src/tests/distro-import/t_importer.py	Tue Aug 02 11:11:53 2011 +0530
+++ b/src/tests/distro-import/t_importer.py	Wed Aug 03 17:49:35 2011 -0700
@@ -96,7 +96,7 @@
                 os.mkdir(tmp)
 
                 # verify we can pkgrecv all packages we have imported
-                pkg_list = ("package/pkg entire system/zones/brand/ipkg "
+                pkg_list = ("package/pkg entire package/pkg/package-manager "
                 "consolidation/solaris_re/solaris_re-incorporation "
                 "pkg5test_install")