dev-libs/ucommon: remove duplicate patch

Package-Manager: Portage-2.3.28, Repoman-2.3.9 Closes: gentoo#7905
johu · Apr 14, 2018 · 4e548d3 · 4e548d3
1 parent bc71e64
commit 4e548d3
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 159 deletions.
diff --git a/dev-libs/ucommon/files/6.1/install_gcrypt.m4_file.patch b/dev-libs/ucommon/files/6.1/install_gcrypt.m4_file.patch
diff --git a/.../ucommon/files/disable_rtf_gen_doxy.patch → .../ucommon-6.0.3-disable_rtf_gen_doxy.patch b/.../ucommon/files/disable_rtf_gen_doxy.patch → .../ucommon-6.0.3-disable_rtf_gen_doxy.patch
@@ -1,5 +1,5 @@
---- Doxyfile.orig	2010-03-14 04:33:22.303087693 +0200
-+++ Doxyfile	2010-03-14 04:34:34.495254330 +0200
+--- a/Doxyfile
++++ b/Doxyfile
 @@ -37,13 +37,13 @@
  GENERATE_HTMLHELP = YES
  GENERATE_TREEVIEW = YES

diff --git a/...libs/ucommon/files/gcrypt_autotools.patch → ...iles/ucommon-6.0.3-gcrypt_autotools.patch b/...libs/ucommon/files/gcrypt_autotools.patch → ...iles/ucommon-6.0.3-gcrypt_autotools.patch
@@ -1,4 +1,3 @@
-diff --git a/Makefile.am b/Makefile.am
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -8,6 +8,8 @@
@@ -10,7 +9,6 @@ diff --git a/Makefile.am b/Makefile.am
  AUTOMAKE_OPTIONS = no-dependencies dist-zip
  EXTRA_DIST = autogen.sh README* *.pc.in *.spec.in *.spec *-config.in \
      *-config.1 Doxyfile cmodel.sh BUILDS SUPPORT COPYING* COPYRIGHT \
-diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
 @@ -37,8 +37,12 @@
@@ -36,7 +34,6 @@ diff --git a/configure.ac b/configure.ac
          SECURE="gnutls"
      fi
      ;;
-diff --git a/utils/Makefile.am b/utils/Makefile.am
 --- a/utils/Makefile.am
 +++ b/utils/Makefile.am
 @@ -9,9 +9,9 @@

diff --git a/...common/files/install_gcrypt.m4_file.patch → ...common-6.0.3-install_gcrypt.m4_file.patch b/...common/files/install_gcrypt.m4_file.patch → ...common-6.0.3-install_gcrypt.m4_file.patch
@@ -1,5 +1,3 @@
-diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
-new file mode 100644
 --- /dev/null
 +++ m4/libgcrypt.m4
 @@ -0,0 +1,123 @@

diff --git a/...mmon/files/6.1/disable_rtf_gen_doxy.patch → ...ucommon-6.1.10-disable_rtf_gen_doxy.patch b/...mmon/files/6.1/disable_rtf_gen_doxy.patch → ...ucommon-6.1.10-disable_rtf_gen_doxy.patch
@@ -1,5 +1,5 @@
---- Doxyfile.orig	2014-06-26 23:56:45.724303475 +0300
-+++ Doxyfile	2014-06-26 23:57:12.875021734 +0300
+--- a/Doxyfile
++++ b/Doxyfile
 @@ -40,7 +40,7 @@
  GENERATE_HTMLHELP = YES
  GENERATE_TREEVIEW = NO

diff --git a/.../ucommon/files/6.1/gcrypt_autotools.patch → ...les/ucommon-6.1.10-gcrypt_autotools.patch b/.../ucommon/files/6.1/gcrypt_autotools.patch → ...les/ucommon-6.1.10-gcrypt_autotools.patch
@@ -1,4 +1,3 @@
-diff --git a/Makefile.am b/Makefile.am
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -8,6 +8,8 @@
@@ -10,7 +9,6 @@ diff --git a/Makefile.am b/Makefile.am
  EXTRA_DIST = autogen.sh README* *.pc.in *.spec.in *.spec *-config.in \
      *-config.1 Doxyfile cmodel.sh BUILDS SUPPORT COPYING* COPYRIGHT \
      CMakeLists.txt ucommon-config.cmake ucommon.pc.cmake cmake-abi.sh \
-diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
 @@ -40,6 +40,9 @@
@@ -32,7 +30,6 @@ diff --git a/configure.ac b/configure.ac
          SECURE="gnutls"
      fi
      ;;
-diff --git a/utils/Makefile.am b/utils/Makefile.am
 --- a/utils/Makefile.am
 +++ b/utils/Makefile.am
 @@ -9,9 +9,9 @@

diff --git a/dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch b/dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch
@@ -1,5 +1,5 @@
---- ucommon-6.3.1/configure.ac
-+++ ucommon-6.3.1/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -38,8 +38,12 @@
  OPENSSL_LINK=""
  MODULE_FLAGS="-module -shared -avoid-version"
@@ -23,8 +23,8 @@
          SECURE="gnutls"
      fi
      ;;
---- ucommon-6.3.1/utils/Makefile.am
-+++ ucommon-6.3.1/utils/Makefile.am
+--- a/utils/Makefile.am
++++ b/utils/Makefile.am
 @@ -10,9 +10,9 @@
  # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 

diff --git a/dev-libs/ucommon/ucommon-6.0.3.ebuild b/dev-libs/ucommon/ucommon-6.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -29,9 +29,11 @@ DEPEND="virtual/pkgconfig
 	${RDEPEND}"
 
 DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
-PATCHES=( "${FILESDIR}"/disable_rtf_gen_doxy.patch
-		  "${FILESDIR}"/install_gcrypt.m4_file.patch
-		  "${FILESDIR}"/gcrypt_autotools.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.3-disable_rtf_gen_doxy.patch
+	"${FILESDIR}"/${PN}-6.0.3-install_gcrypt.m4_file.patch
+	"${FILESDIR}"/${PN}-6.0.3-gcrypt_autotools.patch
+)
 
 AUTOTOOLS_IN_SOURCE_BUILD=1
 

diff --git a/dev-libs/ucommon/ucommon-6.1.10.ebuild b/dev-libs/ucommon/ucommon-6.1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -33,9 +33,11 @@ DEPEND="virtual/pkgconfig
 	${RDEPEND}"
 
 DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
-PATCHES=( "${FILESDIR}"/6.1/disable_rtf_gen_doxy.patch
-		  "${FILESDIR}"/6.1/install_gcrypt.m4_file.patch
-		  "${FILESDIR}"/6.1/gcrypt_autotools.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.10-disable_rtf_gen_doxy.patch
+	"${FILESDIR}"/${PN}-6.0.3-install_gcrypt.m4_file.patch
+	"${FILESDIR}"/${PN}-6.1.10-gcrypt_autotools.patch
+)
 
 # Needed for doxygen, bug #526726
 AUTOTOOLS_IN_SOURCE_BUILD=1

diff --git a/dev-libs/ucommon/ucommon-6.3.1.ebuild b/dev-libs/ucommon/ucommon-6.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -33,8 +33,10 @@ DEPEND="virtual/pkgconfig
 	${RDEPEND}"
 
 DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
-PATCHES=( "${FILESDIR}"/6.1/install_gcrypt.m4_file.patch
-		  "${FILESDIR}"/${PN}-6.3.1-gcrypt_autotools.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.3-install_gcrypt.m4_file.patch
+	"${FILESDIR}"/${PN}-6.3.1-gcrypt_autotools.patch
+)
 
 # Needed for doxygen, bug #526726
 AUTOTOOLS_IN_SOURCE_BUILD=1

diff --git a/dev-libs/ucommon/ucommon-6.5.2.ebuild b/dev-libs/ucommon/ucommon-6.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -34,7 +34,7 @@ DEPEND="virtual/pkgconfig
 
 DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
 PATCHES=(
-	"${FILESDIR}/6.1/install_gcrypt.m4_file.patch"
+	"${FILESDIR}/${PN}-6.0.3-install_gcrypt.m4_file.patch"
 	"${FILESDIR}/${PN}-6.3.1-gcrypt_autotools.patch"
 )
 

diff --git a/dev-libs/ucommon/ucommon-6.5.7.ebuild b/dev-libs/ucommon/ucommon-6.5.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -34,7 +34,7 @@ DEPEND="virtual/pkgconfig
 
 DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
 PATCHES=(
-	"${FILESDIR}/6.1/install_gcrypt.m4_file.patch"
+	"${FILESDIR}/${PN}-6.0.3-install_gcrypt.m4_file.patch"
 	"${FILESDIR}/${PN}-6.3.1-gcrypt_autotools.patch"
 )