[gentoo-commits] proj/x11:master commit in: x11-apps/xwininfo/

[gentoo-commits] proj/x11:master commit in: x11-apps/xwininfo/

[Chi-Thanh Christopher Nguyen]

commit:     49aa8bfb872d378fd63656ba5956f966e019dae3
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  1 23:59:51 2011 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Fri Jul  1 23:59:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=49aa8bfb

x11-apps/xwininfo: sync with portage

---
 x11-apps/xwininfo/xwininfo-9999.ebuild |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/x11-apps/xwininfo/xwininfo-9999.ebuild b/x11-apps/xwininfo/xwininfo-9999.ebuild
index 47bbb61..f71d30d 100644
--- a/x11-apps/xwininfo/xwininfo-9999.ebuild
+++ b/x11-apps/xwininfo/xwininfo-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit xorg-2
+inherit xorg-2 flag-o-matic
 
 DESCRIPTION="window information utility for X"
 
@@ -15,3 +15,11 @@ RDEPEND=">=x11-libs/libxcb-1.6
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
 	>=x11-proto/xproto-7.0.17"
+
+pkg_setup() {
+	# interix has a _very_ old iconv in libc, however, including
+	# iconv.h redefines those symbols to libiconv_*, which then
+	# are unresolved, as the configure check is old and dumb.
+	[[ ${CHOST} == *-interix* ]] &&
+		append-libs -liconv
+}

[gentoo-commits] proj/x11:master commit in: x11-apps/xwininfo/

[Matt Turner]

commit:     6dc27595609c35d3607bd2293b445781a479da31
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sun Sep 25 23:07:36 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sun Sep 25 23:07:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=6dc27595

x11-apps/xwininfo: move libX11 from RDEPEND to DEPEND

---
 x11-apps/xwininfo/xwininfo-9999.ebuild |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-apps/xwininfo/xwininfo-9999.ebuild b/x11-apps/xwininfo/xwininfo-9999.ebuild
index f71d30d..9aedc61 100644
--- a/x11-apps/xwininfo/xwininfo-9999.ebuild
+++ b/x11-apps/xwininfo/xwininfo-9999.ebuild
@@ -11,9 +11,9 @@ DESCRIPTION="window information utility for X"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
-RDEPEND=">=x11-libs/libxcb-1.6
-	x11-libs/libX11"
+RDEPEND=">=x11-libs/libxcb-1.6"
 DEPEND="${RDEPEND}
+	x11-libs/libX11
 	>=x11-proto/xproto-7.0.17"
 
 pkg_setup() {