commit: 109ac02935b9aeadd1916890b436d7211c1a793e Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Wed Nov 24 16:59:17 2021 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Wed Nov 24 17:44:09 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=109ac029
dev-libs/lockdev: make all patches eapply-compliant Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> dev-libs/lockdev/files/lockdev-1.0.3-add-autotools.patch | 8 ++++---- dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild | 8 ++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dev-libs/lockdev/files/lockdev-1.0.3-add-autotools.patch b/dev-libs/lockdev/files/lockdev-1.0.3-add-autotools.patch index f54bcb8fd72c..4343528d9860 100644 --- a/dev-libs/lockdev/files/lockdev-1.0.3-add-autotools.patch +++ b/dev-libs/lockdev/files/lockdev-1.0.3-add-autotools.patch @@ -5,8 +5,8 @@ Contributed by Nick Fortino ([email protected]) 2/1/2009 Updated by Jonathan Callen <[email protected]> 2009-09-11 ---- Makefile.am -+++ Makefile.am +--- a/Makefile.am ++++ b/Makefile.am @@ -0,0 +1,20 @@ +include_HEADERS = src/lockdev.h src/ttylock.h + @@ -28,8 +28,8 @@ Updated by Jonathan Callen <[email protected]> 2009-09-11 + for page in $(manpage_links); do \ + $(LN_S) -f lockdev.3 $(DESTDIR)$(man3dir)/$${page} ; \ + done ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -0,0 +1,22 @@ +AC_INIT([lockdev], [1.0.3], [BUG-REPORT-ADDRESS]) +AC_CONFIG_AUX_DIR([scripts]) diff --git a/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild b/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild index 2cd31f466afb..419f982bc81b 100644 --- a/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild +++ b/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild @@ -26,6 +26,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="perl" PATCHES=( + "${WORKDIR}/${DEB_P}.diff" "${FILESDIR}/${MY_P}-add-autotools.patch" "${FILESDIR}/${MY_P}-fix-perl.patch" ) @@ -37,12 +38,7 @@ pkg_setup() { } src_prepare() { - cd "${WORKDIR}" || die - # Note: we do *not* want to be in ${S} for this, as that breaks the patch - epatch "${WORKDIR}/${DEB_P}.diff" - - cd "${S}" || die - epatch "${PATCHES[@]}" + epatch -p1 "${PATCHES[@]}" epatch_user eautoreconf
