Revert "Merge software definitions for integration installation for p…

…y2 and py3 (#21041)"

This reverts commit c581546.

omnibus/config/patches/datadog-agent-integrations-py3/remove-maxfile-maxpath-psutil.patch

@@ -0,0 +1,30 @@
+Partially reverts https://github.com/giampaolo/psutil/pull/1863 to remove the maxpath / maxfile fetch
+diff --git a/psutil/__init__.py b/psutil/__init__.py
+index 1a113bc3..ce962a61 100644
+--- a/psutil/__init__.py
++++ b/psutil/__init__.py
+@@ -2012,23 +2012,7 @@ def disk_partitions(all=False):
+     If *all* parameter is False return physical devices only and ignore
+     all others.
+     """
+-    def pathconf(path, name):
+-        try:
+-            return os.pathconf(path, name)
+-        except (OSError, AttributeError):
+-            pass
+-
+-    ret = _psplatform.disk_partitions(all)
+-    if POSIX:
+-        new = []
+-        for item in ret:
+-            nt = item._replace(
+-                maxfile=pathconf(item.mountpoint, 'PC_NAME_MAX'),
+-                maxpath=pathconf(item.mountpoint, 'PC_PATH_MAX'))
+-            new.append(nt)
+-        return new
+-    else:
+-        return ret
++    return _psplatform.disk_partitions(all)
+
+
+ def disk_io_counters(perdisk=False, nowrap=True):

omnibus/config/projects/agent.rb

@@ -182,13 +182,13 @@
 
 if with_python_runtime? "2"
   dependency 'pylint2'
+  dependency 'datadog-agent-integrations-py2'
 end
 
-if with_python_runtime? "3" or with_python_runtime? "2"
-  dependency 'datadog-agent-integrations'
+if with_python_runtime? "3"
+  dependency 'datadog-agent-integrations-py3'
 end
 
-
 if linux_target?
   dependency 'datadog-security-agent-policies'
 end