Merge branch 'master' of git+ssh://git.overlays.gentoo.org/user/improvise

edit of tampakrap-requested-packages
Conflicts:
	sets/tampakrap-requested-packages
	sets/tampakrap-requested-packages2

2 files changed, 29 insertions, 42 deletions

diff --git a/sets/tampakrap-requested-packages b/sets/tampakrap-requested-packages
index d84b5f4..5a5ded1 100644
--- a/sets/tampakrap-requested-packages
+++ b/sets/tampakrap-requested-packages
@@ -1,5 +1,6 @@
-#dev-python/django               #dep of django-debug-toolbar, django-auth-ldap, django-compressor, djang-xslt
-#dev-lang/ruby                   #dep of kdev-ruby
+<<<<<<< HEAD
+#dev-python/django              #dep of django-debug-toolbar, django-auth-ldap, django-compressor, djang-xslt
+#dev-lang/ruby                  #dep of kdev-ruby
 dev-python/dingus               #dep of django-debug-toolbar
 dev-python/django-auth-ldap
 dev-python/django-debug-toolbar # dep ofdiogenis
@@ -10,17 +11,32 @@ dev-python/pkginfo              #dep of errorhandler
 dev-python/testfixtures         #dep of xlutils
 dev-python/xlutils 
 dev-python/manuel               #dep of testfixtures
+dev-python/djang-xslt           #dep of
 #dev-libs/shared-desktop-ontologies    #dep of nepomuktvnamer
 media-libs/libtvdb              #dep of nepomuktvnamer
-#dev-util/kdevplatform           #dep of kdev-ruby
-#dev-python/setuptools           #dep of dingus, manuel
+#dev-util/kdevplatform          #dep of kdev-ruby
+#dev-python/setuptools          #dep of dingus, manuel
 #dev-python/django-ldap 	        #dep of django-auth-ldap
-#dev-python/sphinx               #dep of django-auth-ldap, errorhandler, pkginfo, testfixtures; for building docs only
-#dev-python/twill                #dep of django-compressor; for test phase
-#dev-python/feedparser           #dep of feedjack
-#dev-python/xlwt                 #dep of xlutils
-#dev-python/xlrd                 #dep of xlutils
+#dev-python/sphinx              #dep of django-auth-ldap, errorhandler, pkginfo, testfixtures; for building docs only
+#dev-python/twill               #dep of django-compressor; for test phase
+#dev-python/feedparser          #dep of feedjack
+#dev-python/xlwt                #dep of xlutils
+#dev-python/xlrd                #dep of xlutils
 
+=======
+# Django
+#dev-python/dingus              #dep of django-debug-toolbar
+dev-python/django-auth-ldap
+dev-python/django-debug-toolbar #dep of diogenis
+dev-python/django-compressor    #dep of diogenis
+#dev-python/errorhandler        #dep of xlutils
+dev-python/feedjack
+#dev-python/pkginfo             #dep of errorhandler
+#dev-python/testfixtures        #dep of xlutils
+dev-python/xlutils
+#dev-python/manuel              #dep of testfixtures
+#dev-python/pkginfo             #dep of errorhandler
+>>>>>>> 3178d221034e720c5a16bd06e06ba9725541ff29
 #net-zope/zope-component        #dep of testfixtures; test phase
 
 # KDE
@@ -29,5 +45,9 @@ kde-misc/google-tasks
 kde-misc/google-contacts-plasmoid
 kde-misc/nepomuktvnamer
 kde-misc/nvidiadevicemonitor
+<<<<<<< HEAD
 kde-misc/akonadi-google         #dep of google-contacts-plasmoid, google-tasks
 
+=======
+#media-libs/libtvdb             #dep of nepomuktvnamer
+>>>>>>> 3178d221034e720c5a16bd06e06ba9725541ff29
diff --git a/sets/tampakrap-requested-packages2 b/sets/tampakrap-requested-packages2
deleted file mode 100644
index d84b5f4..0000000
--- a/sets/tampakrap-requested-packages2
+++ /dev/null
@@ -1,33 +0,0 @@
-#dev-python/django               #dep of django-debug-toolbar, django-auth-ldap, django-compressor, djang-xslt
-#dev-lang/ruby                   #dep of kdev-ruby
-dev-python/dingus               #dep of django-debug-toolbar
-dev-python/django-auth-ldap
-dev-python/django-debug-toolbar # dep ofdiogenis
-dev-python/django-compressor    # diogenis
-dev-python/errorhandler         # dep of xlutils
-dev-python/feedjack 
-dev-python/pkginfo              #dep of errorhandler
-dev-python/testfixtures         #dep of xlutils
-dev-python/xlutils 
-dev-python/manuel               #dep of testfixtures
-#dev-libs/shared-desktop-ontologies    #dep of nepomuktvnamer
-media-libs/libtvdb              #dep of nepomuktvnamer
-#dev-util/kdevplatform           #dep of kdev-ruby
-#dev-python/setuptools           #dep of dingus, manuel
-#dev-python/django-ldap 	        #dep of django-auth-ldap
-#dev-python/sphinx               #dep of django-auth-ldap, errorhandler, pkginfo, testfixtures; for building docs only
-#dev-python/twill                #dep of django-compressor; for test phase
-#dev-python/feedparser           #dep of feedjack
-#dev-python/xlwt                 #dep of xlutils
-#dev-python/xlrd                 #dep of xlutils
-
-#net-zope/zope-component        #dep of testfixtures; test phase
-
-# KDE
-kde-misc/kdev-ruby
-kde-misc/google-tasks
-kde-misc/google-contacts-plasmoid
-kde-misc/nepomuktvnamer
-kde-misc/nvidiadevicemonitor
-kde-misc/akonadi-google         #dep of google-contacts-plasmoid, google-tasks
-