summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-mail/libdbx/files/bad_c.patch14
-rw-r--r--net-mail/libdbx/libdbx-1.0.3.ebuild15
2 files changed, 13 insertions, 16 deletions
diff --git a/net-mail/libdbx/files/bad_c.patch b/net-mail/libdbx/files/bad_c.patch
index 1f7dc6d8ba03..af6a065064fc 100644
--- a/net-mail/libdbx/files/bad_c.patch
+++ b/net-mail/libdbx/files/bad_c.patch
@@ -1,6 +1,5 @@
-diff -ru libdbx_1.0.3/libdbx.c libdbx_1.0.3-new/libdbx.c
---- libdbx_1.0.3/libdbx.c 2002-10-05 15:07:36.000000000 +0200
-+++ libdbx_1.0.3-new/libdbx.c 2006-09-20 08:53:46.000000000 +0200
+--- a/libdbx.c
++++ b/libdbx.c
@@ -485,11 +485,11 @@
switch (blockp.type) {
case 0x01: //pointer to flag
@@ -24,11 +23,8 @@ diff -ru libdbx_1.0.3/libdbx.c libdbx_1.0.3-new/libdbx.c
readtype = W32FT_TYPE;
break;
case 0x13: //recipient's name
-Only in libdbx_1.0.3-new: libdbx.o
-Only in libdbx_1.0.3-new: readdbx
-diff -ru libdbx_1.0.3/readdbx.c libdbx_1.0.3-new/readdbx.c
---- libdbx_1.0.3/readdbx.c 2002-10-05 15:20:25.000000000 +0200
-+++ libdbx_1.0.3-new/readdbx.c 2006-09-20 08:54:10.000000000 +0200
+--- a/readdbx.c
++++ b/readdbx.c
@@ -19,6 +19,7 @@
#include <getopt.h>
#include <time.h>
@@ -37,5 +33,3 @@ diff -ru libdbx_1.0.3/readdbx.c libdbx_1.0.3-new/readdbx.c
#include "libdbx.h"
#include "common.h"
-Only in libdbx_1.0.3-new: readoe
-Files libdbx_1.0.3/timeconv.o and libdbx_1.0.3-new/timeconv.o differ
diff --git a/net-mail/libdbx/libdbx-1.0.3.ebuild b/net-mail/libdbx/libdbx-1.0.3.ebuild
index 4f8dd3227f74..199b0c314a25 100644
--- a/net-mail/libdbx/libdbx-1.0.3.ebuild
+++ b/net-mail/libdbx/libdbx-1.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
MY_PN="libdbx"
MYFILE="${MY_PN}_${PV}.tgz"
@@ -11,16 +11,19 @@ MYFILE="${MY_PN}_${PV}.tgz"
DESCRIPTION="Tools and library for reading Outlook Express mailboxes (.dbx format)"
HOMEPAGE="https://sourceforge.net/projects/ol2mbox"
SRC_URI="mirror://sourceforge/ol2mbox/${MYFILE}"
+S="${WORKDIR}/${MY_PN}_${PV}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 x86"
-IUSE=""
-S="${WORKDIR}/${MY_PN}_${PV}"
+PATCHES=(
+ "${FILESDIR}"/bad_c.patch
+)
src_prepare() {
- epatch "${FILESDIR}/bad_c.patch"
+ default
+
sed -i -e 's/-g/$(CFLAGS) $(LDFLAGS)/;s|gcc|$(CC)|g' Makefile || die
tc-export CC
}