From 8e29593a12b88dfae3d9a214a33e61d8736c5e4c Mon Sep 17 00:00:00 2001
From: Philip Bauer <bauer@starzel.de>
Date: Sun, 4 Oct 2015 13:32:54 +0200
Subject: [PATCH] remove merged plip-configs

---
 plips/plip-20154-easy-backend-theming.cfg | 10 -----
 plips/plip-698-linkintegrity.cfg          | 33 --------------
 plips/plip-imaging-configlet.cfg          | 18 --------
 plips/plip-lxml3.cfg                      |  9 ----
 plips/plip-ptc.cfg                        | 28 ------------
 plips/plip-querystring.cfg                | 18 --------
 plips/plip-setuptools.cfg                 | 14 ------
 plips/plip13260-step-by-step.cfg          | 16 -------
 plips/plip20114-plone.api-integration.cfg | 12 -----
 plips/plip20256-social-tags.cfg           | 12 -----
 plips/plipNNNN-js-css-integration.cfg     | 37 ---------------
 plips/portal-properties-cleanup.cfg       | 55 -----------------------
 plips/remove-sendto.cfg                   |  6 ---
 13 files changed, 268 deletions(-)
 delete mode 100644 plips/plip-20154-easy-backend-theming.cfg
 delete mode 100644 plips/plip-698-linkintegrity.cfg
 delete mode 100644 plips/plip-imaging-configlet.cfg
 delete mode 100644 plips/plip-lxml3.cfg
 delete mode 100644 plips/plip-ptc.cfg
 delete mode 100644 plips/plip-querystring.cfg
 delete mode 100644 plips/plip-setuptools.cfg
 delete mode 100644 plips/plip13260-step-by-step.cfg
 delete mode 100644 plips/plip20114-plone.api-integration.cfg
 delete mode 100644 plips/plip20256-social-tags.cfg
 delete mode 100644 plips/plipNNNN-js-css-integration.cfg
 delete mode 100644 plips/portal-properties-cleanup.cfg
 delete mode 100644 plips/remove-sendto.cfg

diff --git a/plips/plip-20154-easy-backend-theming.cfg b/plips/plip-20154-easy-backend-theming.cfg
deleted file mode 100644
index da3662ab8c..0000000000
--- a/plips/plip-20154-easy-backend-theming.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-[buildout]
-extends = plipbase.cfg
-auto-checkout +=
-    plone.app.layout
-    plonetheme.barceloneta
-
-
-[sources]
-plone.app.layout = git ${remotes:plone}/plone.app.layout.git pushurl=${remotes:plone_push}/plone.app.layout.git branch=backend-tag
-plonetheme.barceloneta = git ${remotes:plone}/plonetheme.barceloneta.git pushurl=${remotes:plone_push}/plonetheme.barceloneta.git branch=backend
diff --git a/plips/plip-698-linkintegrity.cfg b/plips/plip-698-linkintegrity.cfg
deleted file mode 100644
index b369b820de..0000000000
--- a/plips/plip-698-linkintegrity.cfg
+++ /dev/null
@@ -1,33 +0,0 @@
-[buildout]
-extends = plipbase.cfg
-auto-checkout +=
-    plone.app.linkintegrity
-    plone.app.content
-    Products.CMFPlone
-    plone.app.intid
-    plone.app.referenceablebehavior
-    plone.app.contenttypes
-    plone.app.upgrade
-test-eggs +=
-    plone.app.linkintegrity [test]
-
-[instance]
-eggs +=
-    plone.app.linkintegrity
-
-[test-groups]
-# let's hope that plone.app.linkintegrity has no more test isolation problems
-plone_app_testing +=
-    plone.app.linkintegrity
-
-plone_app_testing_test_isolation_problems -=
-    plone.app.linkintegrity
-
-[sources]
-plone.app.linkintegrity = git ${remotes:plone}/plone.app.linkintegrity.git pushurl=${remotes:plone_push}/plone.app.linkintegrity.git branch=plone5
-plone.app.content = git ${remotes:plone}/plone.app.content.git pushurl=${remotes:plone_push}/plone.app.content.git branch=linkintegrity
-Products.CMFPlone = git ${remotes:plone}/Products.CMFPlone.git pushurl=${remotes:plone_push}/Products.CMFPlone.git branch=linkintegrity
-plone.app.intid = git ${remotes:plone}/plone.app.intid.git  pushurl=${remotes:plone_push}/plone.app.intid.git branch=linkintegrity
-plone.app.referenceablebehavior = git ${remotes:plone}/plone.app.referenceablebehavior.git pushurl=${remotes:plone_push}/plone.app.referenceablebehavior.git branch=linkintegrity
-plone.app.contenttypes = git ${remotes:plone}/plone.app.contenttypes.git pushurl=${remotes:plone_push}/plone.app.contenttypes.git branch=linkintegrity
-plone.app.upgrade = git ${remotes:plone}/plone.app.upgrade.git pushurl=${remotes:plone_push}/plone.app.upgrade.git branch=linkintegrity
diff --git a/plips/plip-imaging-configlet.cfg b/plips/plip-imaging-configlet.cfg
deleted file mode 100644
index b309b43964..0000000000
--- a/plips/plip-imaging-configlet.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-# https://github.com/plone/plone.app.imaging/issues/12
-# Migrate p.a.imaging controlpanel to CMFPlone and to z3c.form.
-# This does not need a PLIP.
-
-[buildout]
-extends = plipbase.cfg
-
-auto-checkout +=
-    Products.CMFPlone
-    plone.app.imaging
-    plone.app.upgrade
-    plone.app.blob
-
-[sources]
-Products.CMFPlone     = git ${remotes:plone}/Products.CMFPlone.git pushurl=${remotes:plone_push}/Products.CMFPlone.git branch=imaging
-plone.app.imaging     = git ${remotes:plone}/plone.app.imaging.git pushurl=${remotes:plone_push}/plone.app.imaging.git branch=controlpanel-move
-plone.app.upgrade     = git ${remotes:plone}/plone.app.upgrade.git pushurl=${remotes:plone_push}/plone.app.upgrade.git branch=imaging-controlpanel-move
-plone.app.blob        = git ${remotes:plone}/plone.app.blob.git pushurl=${remotes:plone_push}/plone.app.blob.git branch=imaging-controlpanel-move
\ No newline at end of file
diff --git a/plips/plip-lxml3.cfg b/plips/plip-lxml3.cfg
deleted file mode 100644
index 4f2137db22..0000000000
--- a/plips/plip-lxml3.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-# Upgrade to LXML 3.x
-# https://github.com/plone/Products.CMFPlone/issues/857
-
-[buildout]
-extends = plipbase.cfg
-eggs += cssselect
-
-[versions]
-lxml = 3.4.4
diff --git a/plips/plip-ptc.cfg b/plips/plip-ptc.cfg
deleted file mode 100644
index 8ae36a4d56..0000000000
--- a/plips/plip-ptc.cfg
+++ /dev/null
@@ -1,28 +0,0 @@
-# https://github.com/plone/Products.CMFPlone/issues/388
-# PloneTestCase removal. This does not need a PLIP.
-
-[buildout]
-extends = plipbase.cfg
-
-auto-checkout +=
-    Products.ATContentTypes
-
-[sources]
-Products.ATContentTypes = git git://github.com/plone/Products.ATContentTypes.git pushurl=git@github.com:plone/Products.ATContentTypes.git branch=tomgross-ptc
-#plone.app.blob = git git://github.com/plone/plone.app.blob.git pushurl=git@github.com:plone/plone.app.blob.git branch=revert-16-revert-14-tomgross-ptc-v3
-#plone.app.folder = git git://github.com/plone/plone.app.folder.git pushurl=git@github.com:plone/plone.app.blob.git branch=revert-5-revert-4-revert-3-tomgross-noptc
-
-
-# IGNORE:
-# Products.ResourceRegistries will be gone in Plone 5
-# Products.PloneLanguageTool will be gone in Plone 5
-# plone.app.controlpanel will be gone in Plone 5
-
-# MERGED:
-# Products.ATContentTypes pr has been merged: https://github.com/plone/Products.ATContentTypes/pull/10
-# plone.app.upgrade commit has been cherry-picked: https://github.com/plone/plone.app.upgrade/commit/3663cd3ec4f4163619b982ce38e5d7b08b6a3de4
-# plone.outputfilters pr has been merged: https://github.com/plone/plone.outputfilters/pull/10
-# plone.openid pr has been merged: https://github.com/plone/plone.openid/pull/7
-# plone.app.openid pr has been merged: https://github.com/plone/plone.app.openid/pull/5
-# Products.Archetypes pr has been merged: https://github.com/plone/Products.Archetypes/pull/42
-# Products.CMFDynamicViewFTI pr has been merged: https://github.com/plone/Products.CMFDynamicViewFTI/pull/3
diff --git a/plips/plip-querystring.cfg b/plips/plip-querystring.cfg
deleted file mode 100644
index 509931cbda..0000000000
--- a/plips/plip-querystring.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-# 
-
-[buildout]
-extends = plipbase.cfg
-auto-checkout +=
-    mockup
-    Products.CMFPlone
-    plone.app.querystring
-    plone.app.contenttypes
-    plone.app.upgrade
-
-[sources]
-mockup = git ${remotes:plone}/Mockup.git pushurl=${remotes:plone_push}/Mockup.git branch=mrtango-subject-all-operator
-Products.CMFPlone = git ${remotes:plone}/Products.CMFPlone.git pushurl=${remotes:plone_push}/Products.CMFPlone.git branch=mrtango-subject-all-operator
-plone.app.querystring = git ${remotes:plone}/plone.app.querystring.git pushurl=${remotes:plone_push}/plone.app.querystring.git branch=mrtango-subject-all-operator
-plone.app.contenttypes = git ${remotes:plone}/plone.app.contenttypes.git pushurl=${remotes:plone_push}/plone.app.contenttypes.git branch=mrtango-subject-all-operator
-plone.app.upgrade = git ${remotes:plone}/plone.app.upgrade.git pushurl=${remotes:plone_push}/plone.app.upgrade.git branch=mrtango-subject-all-operator
-
diff --git a/plips/plip-setuptools.cfg b/plips/plip-setuptools.cfg
deleted file mode 100644
index 6e8a878555..0000000000
--- a/plips/plip-setuptools.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-# https://github.com/plone/Products.CMFPlone/issues/403
-# Upgrade to latest setuptools/zc.buildout versions. No PLIP needed.
-
-[buildout]
-extends = plipbase.cfg
-
-auto-checkout +=
-    Products.GenericSetup
-
-[sources]
-
-[versions]
-setuptools = 15.2
-zc.buildout = 2.3.1
diff --git a/plips/plip13260-step-by-step.cfg b/plips/plip13260-step-by-step.cfg
deleted file mode 100644
index 3139ba6820..0000000000
--- a/plips/plip13260-step-by-step.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-[buildout]
-extends = plipbase.cfg
-
-auto-checkout +=
-    Products.CMFPlone
-    plone.app.content
-    plone.app.upgrade
-    Products.Archetypes
-    Products.ATContentTypes
-    plone.app.customerize
-
-[sources]
-Products.CMFPlone = git ${remotes:plone}/Products.CMFPlone.git pushurl=${remotes:plone_push}/Products.CMFPlone.git branch=plip-13260-step_by_step
-plone.app.content = git ${remotes:plone}/plone.app.content.git pushurl=${remotes:plone_push}/plone.app.content.git branch=plip-13260-step_by_step
-plone.app.upgrade = git ${remotes:plone}/plone.app.upgrade.git pushurl=${remotes:plone_push}/plone.app.upgrade.git branch=plip-13260-step_by_step
-
diff --git a/plips/plip20114-plone.api-integration.cfg b/plips/plip20114-plone.api-integration.cfg
deleted file mode 100644
index fede507750..0000000000
--- a/plips/plip20114-plone.api-integration.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-[buildout]
-extends = plipbase.cfg
-auto-checkout +=
-    plone.api
-    Products.CMFPlone
-
-test-eggs +=
-    plone.api [test]
-
-[sources]
-plone.api = git ${remotes:plone}/plone.api.git pushurl=${remotes:plone_push}/plone.api.git branch=master
-Products.CMFPlone = git ${remotes:plone}/Products.CMFPlone.git pushurl=${remotes:plone_push}/Products.CMFPlone.git branch=20114-plone.api-integration
diff --git a/plips/plip20256-social-tags.cfg b/plips/plip20256-social-tags.cfg
deleted file mode 100644
index 56a3ff13f8..0000000000
--- a/plips/plip20256-social-tags.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-[buildout]
-extends = plipbase.cfg
-auto-checkout +=
-    plone.app.layout
-    Products.CMFPlone
-#    plone.app.upgrade
-
-[sources]
-plone.app.layout = git ${remotes:plone}/plone.app.layout.git pushurl=${remotes:plone_push}/plone.app.layout branch=social-tags 
-Products.CMFPlone = git ${remotes:plone}/Products.CMFPlone.git pushurl=${remotes:plone_push}/Products.CMFPlone.git branch=social_media
-#plone.app.upgrade = git ${remotes:plone}/plone.app.upgrade.git pushurl=${remotes:plone_push}/plone.app.upgrade.git branch=social_tags
-
diff --git a/plips/plipNNNN-js-css-integration.cfg b/plips/plipNNNN-js-css-integration.cfg
deleted file mode 100644
index fbe1a6327f..0000000000
--- a/plips/plipNNNN-js-css-integration.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-# Finishing Resource Registry adaptation
-
-[buildout]
-extends = plipbase.cfg
-parts += robot
-
-auto-checkout +=
-    plone.app.theming
-
-
-auto-checkout -=
-    Products.ResourceRegistries
-
-eggs -=
-    Products.ResourceRegistries
-
-test-eggs -=
-    Products.ResourceRegistries
-
-
-[sources]
-plone.app.theming = git ${remotes:plone}/plone.app.theming.git pushurl=${remotes:plone_push}/plone.app.theming.git branch=bloodbare-optimize
-
-
-[versions]
-
-[robot]
-recipe = zc.recipe.egg
-eggs =
-    ${buildout:eggs}
-    plone.app.multilingual [test]
-    plone.app.robotframework [reload,debug]
-# XXX
-    plone.app.imaging
-scripts =
-    robot
-    robot-server
\ No newline at end of file
diff --git a/plips/portal-properties-cleanup.cfg b/plips/portal-properties-cleanup.cfg
deleted file mode 100644
index 1a053322a6..0000000000
--- a/plips/portal-properties-cleanup.cfg
+++ /dev/null
@@ -1,55 +0,0 @@
-[buildout]
-extends = plipbase.cfg
-
-auto-checkout += Products.CMFPlone
-                 plone.api
-                 plone.app.blob
-                 plone.app.collection
-                 plone.app.content
-                 plone.app.contentlisting
-                 plone.app.contentrules
-                 plone.app.contenttypes
-                 plone.app.dexterity
-                 plone.app.discussion
-                 plone.app.folder
-                 plone.app.iterate
-                 plone.app.layout
-                 plone.app.portlets
-                 plone.app.theming
-                 plone.app.upgrade
-                 plone.app.vocabularies
-                 plone.app.widgets
-                 plone.app.z3cform
-                 plone.dexterity
-                 plone.locking
-                 plone.portlet.collection
-                 Products.Archetypes
-                 Products.ATContentTypes
-                 Products.MimetypesRegistry
-
-[sources]
-plone.app.layout = git ${remotes:plone}/plone.app.layout.git pushurl=${remotes:plone_push}/plone.app.layout.git branch=portal-properties-cleanup
-Products.CMFPlone = git ${remotes:plone}/Products.CMFPlone.git pushurl=${remotes:plone_push}/Products.CMFPlone.git branch=portal-properties-cleanup
-plone.app.upgrade = git ${remotes:plone}/plone.app.upgrade.git pushurl=${remotes:plone_push}/plone.app.upgrade.git branch=portal-properties-cleanup
-plone.app.theming = git ${remotes:plone}/plone.app.theming.git pushurl=${remotes:plone_push}/plone.app.theming.git branch=portal-properties-cleanup
-plone.app.widgets = git ${remotes:plone}/plone.app.widgets.git pushurl=${remotes:plone_push}/plone.app.widgets.git branch=portal-properties-cleanup
-Products.Archetypes = git ${remotes:plone}/Products.Archetypes.git pushurl=${remotes:plone_push}/Products.Archetypes.git branch=portal-properties-cleanup
-plone.app.contenttypes = git ${remotes:plone}/plone.app.contenttypes.git pushurl=${remotes:plone_push}/plone.app.contenttypes.git branch=portal-properties-cleanup
-Products.ATContentTypes = git ${remotes:plone}/Products.ATContentTypes.git pushurl=${remotes:plone_push}/Products.ATContentTypes.git branch=portal-properties-cleanup
-plone.app.blob = git ${remotes:plone}/plone.app.blob.git pushurl=${remotes:plone_push}/plone.app.blob.git branch=portal-properties-cleanup
-plone.app.content = git ${remotes:plone}/plone.app.content.git pushurl=${remotes:plone_push}/plone.app.content.git branch=portal-properties-cleanup
-plone.app.contentlisting = git ${remotes:plone}/plone.app.contentlisting.git pushurl=${remotes:plone_push}/plone.app.contentlisting.git branch=portal-properties-cleanup
-plone.app.dexterity = git ${remotes:plone}/plone.app.dexterity.git pushurl=${remotes:plone_push}/plone.app.dexterity.git branch=portal-properties-cleanup
-plone.app.discussion = git ${remotes:plone}/plone.app.discussion.git pushurl=${remotes:plone_push}/plone.app.discussion.git branch=portal-properties-cleanup
-plone.app.folder = git ${remotes:plone}/plone.app.folder.git pushurl=${remotes:plone_push}/plone.app.folder.git branch=portal-properties-cleanup
-plone.dexterity = git ${remotes:plone}/plone.dexterity.git pushurl=${remotes:plone_push}/plone.dexterity.git branch=portal-properties-cleanup
-plone.locking = git ${remotes:plone}/plone.locking.git pushurl=${remotes:plone_push}/plone.locking.git branch=portal-properties-cleanup
-plone.portlet.collection = git ${remotes:plone}/plone.portlet.collection.git pushurl=${remotes:plone_push}/plone.portlet.collection.git branch=portal-properties-cleanup
-plone.app.collection = git ${remotes:plone}/plone.app.collection.git pushurl=${remotes:plone_push}/plone.app.collection.git branch=portal-properties-cleanup
-plone.app.z3cform = git ${remotes:plone}/plone.app.z3cform.git pushurl=${remotes:plone_push}/plone.app.z3cform.git branch=portal-properties-cleanup
-plone.app.portlets = git ${remotes:plone}/plone.app.portlets.git pushurl=${remotes:plone_push}/plone.app.portlets.git branch=portal-properties-cleanup
-plone.app.vocabularies = git ${remotes:plone}/plone.app.vocabularies.git pushurl=${remotes:plone_push}/plone.app.vocabularies.git branch=portal-properties-cleanup
-Products.MimetypesRegistry = git ${remotes:plone}/Products.MimetypesRegistry.git pushurl=${remotes:plone_push}/Products.MimetypesRegistry.git branch=portal-properties-cleanup
-plone.api = git ${remotes:plone}/plone.api.git pushurl=${remotes:plone_push}/plone.api.git branch=portal-properties-cleanup
-plone.app.contentrules = git ${remotes:plone}/plone.app.contentrules.git pushurl=${remotes:plone_push}/plone.app.contentrules.git branch=portal-properties-cleanup
-plone.app.iterate = git ${remotes:plone}/plone.app.iterate.git pushurl=${remotes:plone_push}/plone.app.iterate.git branch=portal-properties-cleanup
\ No newline at end of file
diff --git a/plips/remove-sendto.cfg b/plips/remove-sendto.cfg
deleted file mode 100644
index ac25a63f5a..0000000000
--- a/plips/remove-sendto.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-[buildout]
-extends =
-    plipbase.cfg
-
-[sources]
-Products.CMFPlone                = git ${remotes:plone}/Products.CMFPlone.git pushurl=${remotes:plone_push}/Products.CMFPlone.git branch=remove_sendto_cleanedup
\ No newline at end of file