Cleanup.

(Portage version: 2.1.2-r4)

5 files changed, 0 insertions, 152 deletions

diff --git a/dev-libs/apr-util/files/apr-util-0.9.x-161086-161087.patch b/dev-libs/apr-util/files/apr-util-0.9.x-161086-161087.patch
deleted file mode 100644
index 9cca25d358ce..000000000000
--- a/dev-libs/apr-util/files/apr-util-0.9.x-161086-161087.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-Index: include/apr_reslist.h
-===================================================================
---- include/apr_reslist.h	(revision 161086)
-+++ include/apr_reslist.h	(revision 161087)
-@@ -112,6 +112,24 @@
- APU_DECLARE(apr_status_t) apr_reslist_release(apr_reslist_t *reslist,
-                                               void *resource);
- 
-+/**
-+ * Set the timeout the acquire will wait for a free resource
-+ * when the maximum number of resources is exceeded.
-+ * @param reslist The resource list.
-+ * @param timeout Timeout to wait. The zero waits forewer.
-+ */
-+APU_DECLARE(void) apr_reslist_timeout_set(apr_reslist_t *reslist,
-+                                          apr_interval_time_t timeout);
-+
-+/**
-+ * Invalidate a resource in the pool - e.g. a database connection
-+ * that returns a "lost connection" error and can't be restored.
-+ * Use this instead of apr_reslist_release if the resource is bad.
-+ */
-+APU_DECLARE(apr_status_t) apr_reslist_invalidate(apr_reslist_t *reslist,
-+                                                 void *resource);
-+
-+
- #ifdef __cplusplus
- }
- #endif
-Index: misc/apr_reslist.c
-===================================================================
---- misc/apr_reslist.c	(revision 161086)
-+++ misc/apr_reslist.c	(revision 161087)
-@@ -50,6 +50,7 @@
-     int smax; /* soft maximum on the total number of resources */
-     int hmax; /* hard maximum on the total number of resources */
-     apr_interval_time_t ttl; /* TTL when we have too many resources */
-+    apr_interval_time_t timeout; /* Timeout for waiting on resource */
-     apr_reslist_constructor constructor;
-     apr_reslist_destructor destructor;
-     void *params; /* opaque data passed to constructor and destructor calls */
-@@ -119,12 +120,9 @@
-     res = apr_pcalloc(reslist->pool, sizeof(*res));
- 
-     rv = reslist->constructor(&res->opaque, reslist->params, reslist->pool);
--    if (rv != APR_SUCCESS) {
--        return rv;
--    }
- 
-     *ret_res = res;
--    return APR_SUCCESS;
-+    return rv;
- }
- 
- /**
-@@ -133,14 +131,7 @@
-  */
- static apr_status_t destroy_resource(apr_reslist_t *reslist, apr_res_t *res)
- {
--    apr_status_t rv;
--
--    rv = reslist->destructor(res->opaque, reslist->params, reslist->pool);
--    if (rv != APR_SUCCESS) {
--        return rv;
--    }
--
--    return APR_SUCCESS;
-+    return reslist->destructor(res->opaque, reslist->params, reslist->pool);
- }
- 
- static apr_status_t reslist_cleanup(void *data_)
-@@ -188,6 +179,7 @@
-         /* Create the resource */
-         rv = create_resource(reslist, &res);
-         if (rv != APR_SUCCESS) {
-+            free_container(reslist, res);
-             apr_thread_mutex_unlock(reslist->listlock);
-             return rv;
-         }
-@@ -314,7 +306,15 @@
-      * a new one, or something becomes free. */
-     else while (reslist->ntotal >= reslist->hmax
-                 && reslist->nidle <= 0) {
--        apr_thread_cond_wait(reslist->avail, reslist->listlock);
-+        if (reslist->timeout) {
-+            if ((rv = apr_thread_cond_timedwait(reslist->avail, 
-+                reslist->listlock, reslist->timeout)) != APR_SUCCESS) {
-+                apr_thread_mutex_unlock(reslist->listlock);
-+                return rv;
-+            }
-+        }
-+        else
-+            apr_thread_cond_wait(reslist->avail, reslist->listlock);
-     }
-     /* If we popped out of the loop, first try to see if there
-      * are new resources available for immediate use. */
-@@ -330,17 +330,13 @@
-      * a resource to fill the slot and use it. */
-     else {
-         rv = create_resource(reslist, &res);
--
--        if (rv != APR_SUCCESS) {
--           apr_thread_mutex_unlock(reslist->listlock);
--           return rv;
-+        if (rv == APR_SUCCESS) {
-+            reslist->ntotal++;
-+            *resource = res->opaque;
-         }
--
--        reslist->ntotal++;
--        *resource = res->opaque;
-         free_container(reslist, res);
-         apr_thread_mutex_unlock(reslist->listlock);
--        return APR_SUCCESS;
-+        return rv;
-     }
- }
- 
-@@ -359,4 +355,21 @@
-     return reslist_maint(reslist);
- }
- 
-+APU_DECLARE(void) apr_reslist_timeout_set(apr_reslist_t *reslist,
-+                                          apr_interval_time_t timeout)
-+{
-+    reslist->timeout = timeout;
-+}
-+
-+APU_DECLARE(apr_status_t) apr_reslist_invalidate(apr_reslist_t *reslist,
-+                                                 void *resource)
-+{
-+    apr_status_t ret;
-+    apr_thread_mutex_lock(reslist->listlock);
-+    ret = reslist->destructor(resource, reslist->params, reslist->pool);
-+    reslist->ntotal--;
-+    apr_thread_mutex_unlock(reslist->listlock);
-+    return ret;
-+}
-+
- #endif  /* APR_HAS_THREADS */
diff --git a/dev-libs/apr-util/files/digest-apr-util-0.9.6-r2 b/dev-libs/apr-util/files/digest-apr-util-0.9.6-r2
deleted file mode 100644
index 09e520fe6560..000000000000
--- a/dev-libs/apr-util/files/digest-apr-util-0.9.6-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a3a2671368e47b7efcb381e991451a9f apr-util-0.9.6.tar.gz 724680
-RMD160 db862e3c04a9a701a9322048047ddccec7ccd8cb apr-util-0.9.6.tar.gz 724680
-SHA256 a5f15d41303baec838f7230f1408f81b90af7bddbc44b2ec323fe958c844f83c apr-util-0.9.6.tar.gz 724680
diff --git a/dev-libs/apr-util/files/digest-apr-util-0.9.7 b/dev-libs/apr-util/files/digest-apr-util-0.9.7
deleted file mode 100644
index b34df06f2ce7..000000000000
--- a/dev-libs/apr-util/files/digest-apr-util-0.9.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6afa5f2866537639dc2d248eb7219e01 apr-util-0.9.7.tar.gz 741891
-RMD160 ea11424ae5a99e360b902b0bb203d6781832d690 apr-util-0.9.7.tar.gz 741891
-SHA256 ee2ab06fbfc029dbc6d49f2a37ac0deb319434f264ead26525b2d6152e08feaa apr-util-0.9.7.tar.gz 741891
diff --git a/dev-libs/apr-util/files/digest-apr-util-1.2.2 b/dev-libs/apr-util/files/digest-apr-util-1.2.2
deleted file mode 100644
index 073c9a4bd805..000000000000
--- a/dev-libs/apr-util/files/digest-apr-util-1.2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8b3f04dde7048946c3c94f85b4debb94 apr-util-1.2.2.tar.gz 645311
-RMD160 5a507e01d32f79ee9405b3d3698f0fc08ad38acc apr-util-1.2.2.tar.gz 645311
-SHA256 b7170fe39edff9ef044464a321194bbee382065dacd0720abc823adbe47731e1 apr-util-1.2.2.tar.gz 645311
diff --git a/dev-libs/apr-util/files/digest-apr-util-1.2.7 b/dev-libs/apr-util/files/digest-apr-util-1.2.7
deleted file mode 100644
index 0f5374538b18..000000000000
--- a/dev-libs/apr-util/files/digest-apr-util-1.2.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c3702668a640be1695956115857ec22e apr-util-1.2.7.tar.gz 641600
-RMD160 339983cbbf4ee66139f14dbb3437d596e5790b2f apr-util-1.2.7.tar.gz 641600
-SHA256 8cd84eb2031a91572e1be2975f4171730a9be72c4cd88718c4c40ac7dc4fd7d3 apr-util-1.2.7.tar.gz 641600