| 1 |
commit: 478240b6f4172a585534c1076778c589a788b5af |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 5 18:39:40 2019 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 5 18:39:40 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=478240b6 |
| 7 |
|
| 8 |
app-mobilephone/gnokii: Revbump for dependency fix |
| 9 |
|
| 10 |
virtual/mysql is server only |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/665828 |
| 13 |
Package-Manager: Portage-2.3.59, Repoman-2.3.12 |
| 14 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
| 15 |
|
| 16 |
.../{gnokii-9999.ebuild => gnokii-0.6.31-r2.ebuild} | 16 ++++++++++------ |
| 17 |
app-mobilephone/gnokii/gnokii-9999.ebuild | 6 +++--- |
| 18 |
2 files changed, 13 insertions(+), 9 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-mobilephone/gnokii/gnokii-9999.ebuild b/app-mobilephone/gnokii/gnokii-0.6.31-r2.ebuild |
| 21 |
similarity index 92% |
| 22 |
copy from app-mobilephone/gnokii/gnokii-9999.ebuild |
| 23 |
copy to app-mobilephone/gnokii/gnokii-0.6.31-r2.ebuild |
| 24 |
index af17537e188..30ba63e2ac4 100644 |
| 25 |
--- a/app-mobilephone/gnokii/gnokii-9999.ebuild |
| 26 |
+++ b/app-mobilephone/gnokii/gnokii-0.6.31-r2.ebuild |
| 27 |
@@ -1,9 +1,8 @@ |
| 28 |
-# Copyright 1999-2018 Gentoo Foundation |
| 29 |
+# Copyright 1999-2019 Gentoo Authors |
| 30 |
# Distributed under the terms of the GNU General Public License v2 |
| 31 |
|
| 32 |
EAPI=6 |
| 33 |
- |
| 34 |
-inherit autotools eutils linux-info |
| 35 |
+inherit autotools desktop eutils linux-info |
| 36 |
|
| 37 |
HOMEPAGE="http://www.gnokii.org/" |
| 38 |
if [[ $PV == *9999 ]]; then |
| 39 |
@@ -29,14 +28,16 @@ RDEPEND=" |
| 40 |
sms? ( |
| 41 |
dev-libs/glib:2 |
| 42 |
postgres? ( dev-db/postgresql:* ) |
| 43 |
- mysql? ( virtual/mysql:= ) |
| 44 |
+ mysql? ( dev-db/mysql-connector-c:= ) |
| 45 |
) |
| 46 |
usb? ( virtual/libusb:0 ) |
| 47 |
- X? ( x11-libs/gtk+:2 )" |
| 48 |
+ X? ( x11-libs/gtk+:2 ) |
| 49 |
+" |
| 50 |
DEPEND="${RDEPEND} |
| 51 |
dev-util/intltool |
| 52 |
irda? ( virtual/os-headers ) |
| 53 |
- nls? ( sys-devel/gettext )" |
| 54 |
+ nls? ( sys-devel/gettext ) |
| 55 |
+" |
| 56 |
|
| 57 |
CONFIG_CHECK="~UNIX98_PTYS" |
| 58 |
|
| 59 |
@@ -49,6 +50,7 @@ MY_AVAILABLE_LINGUAS=" cs de et fi fr it nl pl pt sk sl sv zh_CN" |
| 60 |
PATCHES=( |
| 61 |
"${FILESDIR}"/${P}-fix_xgnokii_inclusion.patch |
| 62 |
"${FILESDIR}"/${P}-gcc5.patch |
| 63 |
+ "${FILESDIR}"/${P}-gcc7.patch |
| 64 |
) |
| 65 |
|
| 66 |
src_prepare() { |
| 67 |
@@ -61,6 +63,7 @@ src_prepare() { |
| 68 |
sed -i -e "s:/usr/local:${EPREFIX}/usr:" Docs/sample/gnokiirc || die |
| 69 |
|
| 70 |
default |
| 71 |
+ mv configure.{in,ac} || die |
| 72 |
|
| 73 |
eautoreconf |
| 74 |
} |
| 75 |
@@ -77,6 +80,7 @@ src_configure() { |
| 76 |
|
| 77 |
econf \ |
| 78 |
--disable-static \ |
| 79 |
+ --enable-security \ |
| 80 |
--disable-unix98test \ |
| 81 |
$(use_enable bluetooth) \ |
| 82 |
${config_xdebug} \ |
| 83 |
|
| 84 |
diff --git a/app-mobilephone/gnokii/gnokii-9999.ebuild b/app-mobilephone/gnokii/gnokii-9999.ebuild |
| 85 |
index af17537e188..39ddb284ab7 100644 |
| 86 |
--- a/app-mobilephone/gnokii/gnokii-9999.ebuild |
| 87 |
+++ b/app-mobilephone/gnokii/gnokii-9999.ebuild |
| 88 |
@@ -1,9 +1,9 @@ |
| 89 |
-# Copyright 1999-2018 Gentoo Foundation |
| 90 |
+# Copyright 1999-2019 Gentoo Authors |
| 91 |
# Distributed under the terms of the GNU General Public License v2 |
| 92 |
|
| 93 |
EAPI=6 |
| 94 |
|
| 95 |
-inherit autotools eutils linux-info |
| 96 |
+inherit autotools desktop eutils linux-info |
| 97 |
|
| 98 |
HOMEPAGE="http://www.gnokii.org/" |
| 99 |
if [[ $PV == *9999 ]]; then |
| 100 |
@@ -29,7 +29,7 @@ RDEPEND=" |
| 101 |
sms? ( |
| 102 |
dev-libs/glib:2 |
| 103 |
postgres? ( dev-db/postgresql:* ) |
| 104 |
- mysql? ( virtual/mysql:= ) |
| 105 |
+ mysql? ( dev-db/mysql-connector-c:= ) |
| 106 |
) |
| 107 |
usb? ( virtual/libusb:0 ) |
| 108 |
X? ( x11-libs/gtk+:2 )" |
Archives