[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/files/, dev-java/commons-logging/

2018-04-14 Thread Patrice Clement 
commit: 2b2d62ef69b9ece31470ab6d8435a777cfe2366f
Author: Marty E. Plummer  startmail  com>
AuthorDate: Tue Apr 10 21:49:00 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Apr 14 21:03:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b2d62ef

dev-java/commons-logging: epatch->eapply.

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-java/commons-logging/commons-logging-1.2-r2.ebuild  | 4 ++--
 dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch | 4 ++--
 dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild 
b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
index 4aae5b05685..0f4bba416ed 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
@@ -43,9 +43,9 @@ DOCS=( RELEASE-NOTES.txt PROPOSAL.html )
 src_prepare() {
default
 
-   epatch "${FILESDIR}/${P}-gentoo.patch"
+   eapply "${FILESDIR}/${P}-gentoo.patch"
# patch to make the build.xml respect no servletapi
-   epatch "${FILESDIR}/${P}-servletapi.patch"
+   eapply "${FILESDIR}/${P}-servletapi.patch"
 
# bug #208098
echo "jdk.1.4.present=true" > build.properties || die

diff --git a/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch 
b/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch
index f359e8e224b..a654ce1fc76 100644
--- a/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch
+++ b/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch
@@ -1,5 +1,5 @@
 a/build.xml2013-05-16 22:04:22.0 +0200
-+++ b/build.xml2013-12-25 23:58:47.447266535 +0100
+--- a/build.xml
 b/build.xml
 @@ -773,4 +773,23 @@
  


diff --git 
a/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch 
b/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch
index 96299c131f1..a9fccba8d5c 100644
--- a/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch
+++ b/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch
@@ -1,5 +1,5 @@
 a/build.xml2013-12-26 00:00:51.019721667 +0100
-+++ b/build.xml2013-12-26 00:22:27.616511976 +0100
+--- a/build.xml
 b/build.xml
 @@ -279,6 +279,8 @@
 classpathref="compile.classpath"
 classname="org.apache.log.Logger"/>

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/files/

2016-04-27 Thread James Le Cuirot 
commit: d02017503f820ff10510f8ced8b6147e61377ad8
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Apr 27 09:04:18 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Apr 27 09:04:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0201750

dev-java/commons-logging: Remove old files

Package-Manager: portage-2.2.28

 .../files/commons-logging-1.1-gentoo.patch | 27 -
 .../files/commons-logging-1.1-manifest |  8 
 .../files/commons-logging-1.1-servletapi.patch | 47 --
 .../files/commons-logging-1.1.1-gentoo.patch   | 26 
 .../files/commons-logging-1.1.1-manifest   |  8 
 .../files/commons-logging-1.1.1-servletapi.patch   | 46 -
 6 files changed, 162 deletions(-)

diff --git a/dev-java/commons-logging/files/commons-logging-1.1-gentoo.patch 
b/dev-java/commons-logging/files/commons-logging-1.1-gentoo.patch
deleted file mode 100644
index 06ac54c..000
--- a/dev-java/commons-logging/files/commons-logging-1.1-gentoo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
 build.xml.original 2006-10-01 18:15:11.0 +0200
-+++ build.xml  2006-10-01 18:36:46.0 +0200
-@@ -772,5 +772,23 @@
-   One or more unit tests failed.
- 
-   
--
-+  
-+
-+
-+
-+  
-+  
-+
-+
-+
-+
-+
-+
-+  
-+
-+
-+  
-+
-+  
-+ 
- 

diff --git a/dev-java/commons-logging/files/commons-logging-1.1-manifest 
b/dev-java/commons-logging/files/commons-logging-1.1-manifest
deleted file mode 100644
index 09d24e8..000
--- a/dev-java/commons-logging/files/commons-logging-1.1-manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %bundleName
-Bundle-Vendor: %vendorName
-Bundle-Localization: plugin
-Bundle-SymbolicName: org.apache.commons.logging
-Bundle-Version: 1.1
-Export-Package: 
org.apache.commons.logging;version="1.1",org.apache.commons.logging.impl;version="1.1"

diff --git 
a/dev-java/commons-logging/files/commons-logging-1.1-servletapi.patch 
b/dev-java/commons-logging/files/commons-logging-1.1-servletapi.patch
deleted file mode 100644
index 0045cd1..000
--- a/dev-java/commons-logging/files/commons-logging-1.1-servletapi.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -ru commons-logging-1.1-src/build.xml 
commons-logging-1.1-src-patched/build.xml
 commons-logging-1.1-src/build.xml  2006-05-09 17:45:08.0 -0400
-+++ commons-logging-1.1-src-patched/build.xml  2006-10-20 01:16:51.0 
-0400
-@@ -274,6 +274,10 @@
-classpathref="compile.classpath"
-classname="org.apache.log.Logger"/>
- 
-+  
-+
- 
-@@ -303,6 +307,13 @@
- -->
-   
-   
-+  
-+
-+*** WARNING ***
-+ServletAPI not found: Cannot Build ServletContextCleaner
-+  
-+  
-+
-   
- 
- *** WARNING ***
-@@ -332,7 +343,7 @@
-   
- 
-   
-+
depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,servletapi-warning,compile-1.4'/>
- 
-   
-@@ -360,6 +371,8 @@
- 
-   
- 
-+
-   
-   
-   
- 
-+  
-+
-+
-+
-+  
-+  
-+
-+
-+
-+
-+
-+
-+  
-+
-+
-+  
-+
-+  
-+
- 

diff --git a/dev-java/commons-logging/files/commons-logging-1.1.1-manifest 
b/dev-java/commons-logging/files/commons-logging-1.1.1-manifest
deleted file mode 100644
index 382da7a..000
--- a/dev-java/commons-logging/files/commons-logging-1.1.1-manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %bundleName
-Bundle-Vendor: %vendorName
-Bundle-Localization: plugin
-Bundle-SymbolicName: org.apache.commons.logging
-Bundle-Version: 1.1.1
-Export-Package: 
org.apache.commons.logging;version="1.1.1",org.apache.commons.logging.impl;version="1.1.1"

diff --git 
a/dev-java/commons-logging/files/commons-logging-1.1.1-servletapi.patch 
b/dev-java/commons-logging/files/commons-logging-1.1.1-servletapi.patch
deleted file mode 100644
index 2c29fa5..000
--- a/dev-java/commons-logging/files/commons-logging-1.1.1-servletapi.patch
+++ /dev/null
@@ -1,46 +0,0 @@
 build.xml.orig22008-02-06 16:13:45.0 +0100
-+++ build.xml  2008-02-06 16:16:48.0 +0100
-@@ -276,6 +276,11 @@
-classpathref="compile.classpath"
-classname="org.apache.log.Logger"/>
- 
-+  
-+
-+
- 
-@@ -312,6 +317,13 @@
- 
-   
-   
-+  
-+
-+*** WARNING ***
-+ServletAPI not found: Cannot Build ServletContextCleaner
-+  
-+  
-+
-   
- 
- *** WARNING ***
-@@ -334,7 +346,7 @@
-   
- 
-   
-+
depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,servletapi-warning,compile-1.4'/>
- 
-   
-@@ -362,6 +374,8 @@
- 
-   
- 
-+
-   
-