diff options
| author |   Marty E. Plummer <hanetzer@startmail.com> | 2018-04-08 15:08:03 -0500 |
|---|---|---|
| committer |   Patrice Clement <monsieurp@gentoo.org> | 2018-04-10 00:29:50 +0200 |
| commit | 441ab3901fac0b11d7d032ab729dbfd56afb62ef (patch) | |
| tree | 1181da95b72bd11f6cde2e5d69147a0c6021ff58 /app-office/calcurse | |
| parent | profiles: package.use.mask app-editors/emacs[mailutils]. (diff) | |
| download | gentoo-441ab3901fac0b11d7d032ab729dbfd56afb62ef.tar.gz gentoo-441ab3901fac0b11d7d032ab729dbfd56afb62ef.tar.bz2 gentoo-441ab3901fac0b11d7d032ab729dbfd56afb62ef.zip | |
app-office/calcurse: clean duplicate patches.
Package-Manager: Portage-2.3.28, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/7895
Diffstat (limited to 'app-office/calcurse')
| -rw-r--r-- | app-office/calcurse/calcurse-4.2.1.ebuild | 4 | ||||
| -rw-r--r-- | app-office/calcurse/calcurse-4.2.2.ebuild | 4 | ||||
| -rw-r--r-- | app-office/calcurse/files/calcurse-4.2.2-tinfo.patch | 21 |
3 files changed, 4 insertions, 25 deletions
diff --git a/app-office/calcurse/calcurse-4.2.1.ebuild b/app-office/calcurse/calcurse-4.2.1.ebuild index 533762c2e262..47cddd1eb692 100644 --- a/app-office/calcurse/calcurse-4.2.1.ebuild +++ b/app-office/calcurse/calcurse-4.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ DEPEND="${RDEPEND}" DOCS=( AUTHORS NEWS README ) -PATCHES=( "${FILESDIR}"/"${P}-tinfo.patch" ) +PATCHES=( "${FILESDIR}"/"${PN}-4.2.1-tinfo.patch" ) src_prepare() { default diff --git a/app-office/calcurse/calcurse-4.2.2.ebuild b/app-office/calcurse/calcurse-4.2.2.ebuild index 8e6722e27efe..109005b664a8 100644 --- a/app-office/calcurse/calcurse-4.2.2.ebuild +++ b/app-office/calcurse/calcurse-4.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ DEPEND="${RDEPEND}" DOCS=( AUTHORS NEWS README ) -PATCHES=( "${FILESDIR}"/"${P}-tinfo.patch" ) +PATCHES=( "${FILESDIR}"/"${PN}-4.2.1-tinfo.patch" ) src_prepare() { default diff --git a/app-office/calcurse/files/calcurse-4.2.2-tinfo.patch b/app-office/calcurse/files/calcurse-4.2.2-tinfo.patch deleted file mode 100644 index f3d2aac897e9..000000000000 --- a/app-office/calcurse/files/calcurse-4.2.2-tinfo.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -3,7 +3,7 @@ - #------------------------------------------------------------------------------- - AC_PREREQ(2.59) - AC_INIT([calcurse], -- m4_esyscmd([build-aux/git-version-gen .version]), -+ m4_esyscmd_s([cat .version]), - [bugs@calcurse.org]) - AM_INIT_AUTOMAKE - #m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) -@@ -51,6 +51,9 @@ - LIBS="$LIBS -l$available_ncurses" - ]) - -+AC_SEARCH_LIBS([cbreak], [tinfow tinfo],, -+ AC_MSG_ERROR([Cannot find a library providing cbreak])) -+ - AC_CHECK_HEADERS([pthread.h], [ - AC_CHECK_LIB(pthread, pthread_create, [ - LIBS="$LIBS -pthread" |