gentoo resync : 05.02.2020

2 files changed, 0 insertions, 50 deletions

diff --git a/dev-python/carbon/files/carbon-0.9.12-no-data-files.patch b/dev-python/carbon/files/carbon-0.9.12-no-data-files.patch
deleted file mode 100644
index 129c7189f3b0..000000000000
--- a/dev-python/carbon/files/carbon-0.9.12-no-data-files.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur carbon-0.9.12.orig/setup.py carbon-0.9.12/setup.py
---- /setup.py	2013-08-22 00:53:16.000000000 +0800
-+++ /setup.py	2014-01-26 11:20:59.705864697 +0800
-@@ -13,12 +13,6 @@
-   setup_kwargs = dict()
- 
- 
--storage_dirs = [ ('storage/whisper',[]), ('storage/lists',[]),
--                 ('storage/log',[]), ('storage/rrd',[]) ]
--conf_files = [ ('conf', glob('conf/*.example')) ]
--
--install_files = storage_dirs + conf_files
--
- # If we are building on RedHat, let's use the redhat init scripts.
- if platform.dist()[0] == 'redhat':
-     init_scripts = [ ('/etc/init.d', ['distro/redhat/init.d/carbon-cache',
-@@ -39,7 +33,6 @@
-   package_dir={'' : 'lib'},
-   scripts=glob('bin/*'),
-   package_data={ 'carbon' : ['*.xml'] },
--  data_files=install_files,
-   install_requires=['twisted', 'txamqp'],
-   **setup_kwargs
- )
diff --git a/dev-python/carbon/files/no-data-files.patch b/dev-python/carbon/files/no-data-files.patch
deleted file mode 100644
index 7b0c52f3948b..000000000000
--- a/dev-python/carbon/files/no-data-files.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Do not install the empty storage dirs and config files to the wrong
-location (the ebuild installs them to the right location by hand).
-
-See Gentoo bug #417221.
-
---- setup.py
-+++ setup.py
-@@ -12,9 +12,6 @@
-   setup_kwargs = dict()
- 
- 
--storage_dirs = [ ('storage/whisper',[]), ('storage/lists',[]),
--                 ('storage/log',[]), ('storage/rrd',[]) ]
--conf_files = [ ('conf', glob('conf/*.example')) ]
- #XXX Need a way to have these work for bdist_rpm but be left alone for everything else
- #init_scripts = [ ('/etc/init.d', ['distro/redhat/init.d/carbon-cache',
- #                                  'distro/redhat/init.d/carbon-relay',
-@@ -32,7 +29,6 @@
-   package_dir={'' : 'lib'},
-   scripts=glob('bin/*'),
-   package_data={ 'carbon' : ['*.xml'] },
--  data_files=storage_dirs + conf_files, # + init_scripts,
-   install_requires=['twisted', 'txamqp'],
-   **setup_kwargs
- )
-