Don't incorporate */g++/* packages (with new history logic)

Alexander Pyhalov

2015-11-11 79f2f2539ca4015595b6c62a355f08cf7c65f184

Don't incorporate */g++/* packages (with new history logic)

 components/meta-packages/history/history

@@ -496,9 +496,9 @@
database/postgres-84/library@8.4.22,5.11-2015.0.0.0
database/postgres-84/tests@8.4.22,5.11-2015.0.0.0
database/postgres-84@8.4.22,5.11-2015.0.0.0
database/postgres/library/g++/libpqxx@4.0.1,5.11-2014.0.1.0 database/postgres/library/c++/libpqxx@4.0.1,5.11-2014.1.3.1
database/postgres/library/g++/libpqxx@4.0.1,5.11-2014.0.1.0 database/postgres/library/c++/libpqxx@4.0.1,5.11-2014.1.3.1 noincorporate
database/postgres/pg_upgrade@0.5.11,5.11-2015.0.2.0
desktop/compiz/library/g++/libcompizconfig@0.8.8,5.11-2014.0.1.0 desktop/compiz/library/libcompizconfig@0.8.8,5.11-2014.1.3.0
desktop/compiz/library/g++/libcompizconfig@0.8.8,5.11-2014.0.1.0 desktop/compiz/library/libcompizconfig@0.8.8,5.11-2014.1.3.0 noincorporate
desktop/media-player/moovida/moovida-plugins@0.5.11,5.11-2015.0.2.0
desktop/media-player/moovida@0.5.11,5.11-2015.0.2.0
desktop/media-player/songbird@0.5.11,5.11-2014.0.0.0
@@ -506,7 +506,7 @@
developer/build/automake-19@1.9.6,5.11-5.12.0.0.0.16.0
developer/cxa_finalize@0.1,5.11-2015.0.2.0
developer/documentation-tool/epydoc@3.0.1-2015.0.2.0
developer/g++/icu@4.6,5.11-2014.1.3.0 developer/icu@4.6,5.11-2014.1.3.1
developer/g++/icu@4.6,5.11-2014.1.3.0 developer/icu@4.6,5.11-2014.1.3.1 noincorporate
developer/java/jdk64@0.5.11,5.11-2015.0.1.0 developer/java/openjdk7-64@1.7.76,5.11-2015.0.1.0
developer/java/jdk@0.5.11,5.11-2015.0.1.0 developer/java/openjdk7@1.7.76,5.11-2015.0.1.0
developer/orc@0.4.17,5.11-2014.0.0.1 system/library/orc@0.5.11,5.11-2014.0.0.0
@@ -648,18 +648,18 @@
library/c++/net6@1.3.14,5.11-2014.1.3.0
library/c++/obby@0.4.7,5.11-2014.1.3.0
library/c++/stdcxx@4.2.1,5.11-2014.1.3.0
library/desktop/g++/cairomm@1.10.0,5.11-2014.1.3.0 library/desktop/c++/cairomm@1.10.0,5.11-2014.1.3.1
library/desktop/g++/gtkmm@2.20.3,5.11-2014.1.3.0 library/desktop/c++/gtkmm@2.20.3,5.11-2014.1.3.1
library/desktop/g++/pangomm@2.28.4,5.11-2014.1.3.0 library/desktop/c++/pangomm@2.28.4,5.11-2014.1.3.1
library/desktop/g++/webkitgtk@1.2.7,5.11-2014.1.3.1 library/desktop/webkitgtk@1.2.7,5.11-2014.1.3.1
library/desktop/g++/cairomm@1.10.0,5.11-2014.1.3.0 library/desktop/c++/cairomm@1.10.0,5.11-2014.1.3.1 noincorporate
library/desktop/g++/gtkmm@2.20.3,5.11-2014.1.3.0 library/desktop/c++/gtkmm@2.20.3,5.11-2014.1.3.1 noincorporate
library/desktop/g++/pangomm@2.28.4,5.11-2014.1.3.0 library/desktop/c++/pangomm@2.28.4,5.11-2014.1.3.1 noincorporate
library/desktop/g++/webkitgtk@1.2.7,5.11-2014.1.3.1 library/desktop/webkitgtk@1.2.7,5.11-2014.1.3.1 noincorporate
library/desktop/gobject/gir-repository@0.5.11,5.11-2015.0.2.0
library/desktop/pigment@0.5.11,5.11-2015.0.2.0
library/desktop/search/tracker/tracker-firefox@0.6.96-2015.0.2.0
library/g++/glibmm@2.28.2,5.11-2014.1.3.2 library/c++/glibmm@2.28.2,5.11-2014.1.3.2
library/g++/hdf5@1.8.13,5.11-2014.1.2.0 library/c++/hdf5@1.8.13,5.11-2014.1.3.1
library/g++/icu@4.6,5.11-2014.1.3.0 library/icu@4.6,5.11-2014.1.3.1
library/g++/sigcpp@2.2.10,5.11-2014.0.2.0 library/c++/sigcpp@2.2.10,5.11-2014.1.3.0
library/g++/zeromq@3.2.4,5.11-2014.0.1.0 library/c++/zeromq@3.2.4,5.11-2014.1.3.1
library/g++/glibmm@2.28.2,5.11-2014.1.3.2 library/c++/glibmm@2.28.2,5.11-2014.1.3.2 noincorporate
library/g++/hdf5@1.8.13,5.11-2014.1.2.0 library/c++/hdf5@1.8.13,5.11-2014.1.3.1 noincorporate
library/g++/icu@4.6,5.11-2014.1.3.0 library/icu@4.6,5.11-2014.1.3.1 noincorporate
library/g++/sigcpp@2.2.10,5.11-2014.0.2.0 library/c++/sigcpp@2.2.10,5.11-2014.1.3.0 noincorporate
library/g++/zeromq@3.2.4,5.11-2014.0.1.0 library/c++/zeromq@3.2.4,5.11-2014.1.3.1 noincorporate
library/gnome/print/gnome-print/gnome-print-papi@2.30.0,5.11-2014.0.0.0
library/gnome/print/gnome-print@2.30.0,5.11-2014.0.0.0
library/java/demo64@0.5.11,5.11-2015.0.1.0 library/java/openjdk7/demo64@1.7.76,5.11-2015.0.1.0
@@ -783,9 +783,9 @@
system/desktop/locale/zh_hk@0.5.11,5.11-2015.0.2.0
system/desktop/locale/zh_tw@0.5.11,5.11-2015.0.2.0
system/ipmi/ipmitool@1.8.10,5.11-0.151 system/management/ipmitool@1.8.10-0.151.1.8
system/library/g++/boost/documentation@1.55.0-2015.0.2.0 system/library/g++/boost@1.55.0-0.151.1.8.1
system/library/g++/boost/header-boost@1.55.0-2015.0.2.0 system/library/g++/boost@1.55.0-0.151.1.8.1
system/library/g++/boost@1.55.0,5.11-2014.0.1.0 system/library/boost@1.55.0,5.11-2014.1.3.0
system/library/g++/boost/documentation@1.55.0-2015.0.2.0 system/library/g++/boost@1.55.0-0.151.1.8.1 noincorporate
system/library/g++/boost/header-boost@1.55.0-2015.0.2.0 system/library/g++/boost@1.55.0-0.151.1.8.1 noincorporate
system/library/g++/boost@1.55.0,5.11-2014.0.1.0 system/library/boost@1.55.0,5.11-2014.1.3.0 noincorporate
system/library/libvirt@0.5.11,5.11-2015.0.2.0
system/library/security/crypto/pkcs11_kms@0.5.11,5.11-2015.0.2.0
system/locale/ar-extra@0.5.11,5.11-2015.0.2.0

 tools/generate-history

@@ -17,12 +17,17 @@
    continue
  }
  printf "set name=pkg.fmri value=pkg:/%s\n", fmri
  if (NF == 2) {
  
  if (NF >= 2) {
    print "set name=pkg.renamed value=true"
    printf "depend type=require fmri=%s\n", $2
  } else {
    print "set name=pkg.obsolete value=true"
  }
  
  if ($NF == "noincorporate") {
    print "set name=pkg.tmp.noincorporate value=true"
  }
  print "set name=org.opensolaris.consolidation value=$(CONSOLIDATION)"
  exit 0 # We're done; no point continuing.
}