summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2015-10-04 10:15:57 -0400
committerIan Stakenvicius <axs@gentoo.org>2015-10-04 10:31:54 -0400
commit66cb7efcecc1ab67f5b64528ba251805656bcec4 (patch)
tree7334be5001bbd384c22ada5222308d6b42217e9c
parentsys-kernel/hardened-sources: remove older stable version. (diff)
downloadgentoo-66cb7efcecc1ab67f5b64528ba251805656bcec4.tar.gz
gentoo-66cb7efcecc1ab67f5b64528ba251805656bcec4.tar.bz2
gentoo-66cb7efcecc1ab67f5b64528ba251805656bcec4.zip
dev-libs/libindicator: add missing whitespace before -lm
When dev-util/pkgconfig-0.29 is in use, the _LIBS output of a PKG_CHECK* does not have a trailing space assigned. This causes the link flags to contain a "-lglib-2.0-lm" assignment as $LIBM was appended to $LIBINDICATOR_LIBS without any whitespace separation. This commit adds the necessary whitespace. Fixes bug 545334
-rw-r--r--dev-libs/libindicator/files/libindicator-ldflags-spacing.patch11
-rw-r--r--dev-libs/libindicator/libindicator-12.10.0-r200.ebuild7
-rw-r--r--dev-libs/libindicator/libindicator-12.10.0-r300.ebuild7
-rw-r--r--dev-libs/libindicator/libindicator-12.10.1-r200.ebuild7
-rw-r--r--dev-libs/libindicator/libindicator-12.10.1-r201.ebuild7
-rw-r--r--dev-libs/libindicator/libindicator-12.10.1-r300.ebuild7
-rw-r--r--dev-libs/libindicator/libindicator-12.10.1-r301.ebuild7
7 files changed, 47 insertions, 6 deletions
diff --git a/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch b/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch
new file mode 100644
index 000000000000..8c4a55faec08
--- /dev/null
+++ b/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac 2012-07-11 14:07:33.167169453 -0400
++++ b/configure.ac 2015-10-04 09:59:31.023669616 -0400
+@@ -66,7 +66,7 @@
+ AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
+
+ LT_LIB_M
+-LIBINDICATOR_LIBS+="$LIBM"
++LIBINDICATOR_LIBS+=" $LIBM"
+
+ ##############################
+ # Custom Junk
diff --git a/dev-libs/libindicator/libindicator-12.10.0-r200.ebuild b/dev-libs/libindicator/libindicator-12.10.0-r200.ebuild
index 143817788311..da93c44412b7 100644
--- a/dev-libs/libindicator/libindicator-12.10.0-r200.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.0-r200.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=4
-inherit eutils flag-o-matic virtualx
+inherit autotools eutils flag-o-matic virtualx
DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
HOMEPAGE="https://launchpad.net/libindicator"
@@ -20,6 +20,11 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
test? ( dev-util/dbus-test-runner )"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
+ eautoreconf
+}
+
src_configure() {
append-flags -Wno-error
diff --git a/dev-libs/libindicator/libindicator-12.10.0-r300.ebuild b/dev-libs/libindicator/libindicator-12.10.0-r300.ebuild
index 2e6134c6272a..d19d3a1a3cd7 100644
--- a/dev-libs/libindicator/libindicator-12.10.0-r300.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.0-r300.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=4
-inherit eutils flag-o-matic virtualx
+inherit autotools eutils flag-o-matic virtualx
DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
HOMEPAGE="https://launchpad.net/libindicator"
@@ -20,6 +20,11 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
test? ( dev-util/dbus-test-runner )"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
+ eautoreconf
+}
+
src_configure() {
append-flags -Wno-error
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r200.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r200.ebuild
index 8180ac3a273a..ef3c8a561846 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r200.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r200.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=4
-inherit eutils flag-o-matic virtualx
+inherit autotools eutils flag-o-matic virtualx
DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
HOMEPAGE="https://launchpad.net/libindicator"
@@ -20,6 +20,11 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
test? ( dev-util/dbus-test-runner )"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
+ eautoreconf
+}
+
src_configure() {
append-flags -Wno-error
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
index a837b39df6a0..d9f5a821c6ac 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-inherit eutils flag-o-matic virtualx multilib-minimal
+inherit autotools eutils flag-o-matic virtualx multilib-minimal
DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
HOMEPAGE="https://launchpad.net/libindicator"
@@ -20,6 +20,11 @@ DEPEND="${RDEPEND}
virtual/pkgconfig[${MULTILIB_USEDEP}]
test? ( dev-util/dbus-test-runner )"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
+ eautoreconf
+}
+
multilib_src_configure() {
append-flags -Wno-error
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r300.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r300.ebuild
index c0bf1d5e7e32..621018231ce5 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r300.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r300.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=4
-inherit eutils flag-o-matic virtualx
+inherit autotools eutils flag-o-matic virtualx
DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
HOMEPAGE="https://launchpad.net/libindicator"
@@ -20,6 +20,11 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
test? ( dev-util/dbus-test-runner )"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
+ eautoreconf
+}
+
src_configure() {
append-flags -Wno-error
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
index 430052479f80..d28de0187cf3 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-inherit eutils flag-o-matic virtualx multilib-minimal
+inherit autotools eutils flag-o-matic virtualx multilib-minimal
DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
HOMEPAGE="https://launchpad.net/libindicator"
@@ -20,6 +20,11 @@ DEPEND="${RDEPEND}
virtual/pkgconfig[${MULTILIB_USEDEP}]
test? ( dev-util/dbus-test-runner )"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
+ eautoreconf
+}
+
multilib_src_configure() {
append-flags -Wno-error