Add patch to use LDFLAGS

Package-Manager: portage-2.2.0_alpha109/cvs/Linux x86_64

4 files changed, 71 insertions, 6 deletions

diff --git a/app-i18n/xvnkb/ChangeLog b/app-i18n/xvnkb/ChangeLog
index a3f7c529a021..e6614abe50e1 100644
--- a/app-i18n/xvnkb/ChangeLog
+++ b/app-i18n/xvnkb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/xvnkb
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/xvnkb/ChangeLog,v 1.21 2009/01/07 15:33:14 matsuu Exp $
+# Copyright 2000-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xvnkb/ChangeLog,v 1.22 2012/06/14 04:55:10 naota Exp $
+
+  14 Jun 2012; Naohiro Aota <naota@gentoo.org>
+  +files/xvnkb-0.2.9a-ldflags.patch, xvnkb-0.2.9a-r1.ebuild:
+  Add patch to use LDFLAGS
 
   07 Jan 2009; MATSUU Takuto <matsuu@gentoo.org> xvnkb-0.2.8a-r1.ebuild,
   -xvnkb-0.2.9a.ebuild, xvnkb-0.2.9a-r1.ebuild:
diff --git a/app-i18n/xvnkb/Manifest b/app-i18n/xvnkb/Manifest
index ba7b43f702e3..748abe7b4067 100644
--- a/app-i18n/xvnkb/Manifest
+++ b/app-i18n/xvnkb/Manifest
@@ -1,8 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 0.2.8a-putenv.patch 337 RMD160 f8f8aedac5d7feeb9d0beb8c4a0fc7cb52b6077d SHA1 1060ca9df20f4d3465da9afc6aed1e222b1c3996 SHA256 376e5ae6dbe1e33163748324fd5846c4411a79e046564e2a6267b31585a70b98
 AUX xvnkb-0.2.8a.patch 562 RMD160 915dafc6156fd18e54a3ddc42c175e7df5ec52ba SHA1 5db7fe2109cd383554e738339be5fab1b03ae80f SHA256 f2058b4f459e4d873aac6eddef26a7cea8092d9d34e29cf21afbc43cc00d5b97
+AUX xvnkb-0.2.9a-ldflags.patch 1261 RMD160 405255a600e76e43952549617110ba82a0e6fc2e SHA1 cd4974b0e567061f422aefb9597628778be0d576 SHA256 9af67421431110aa1f867e0aa1ca65f731f413b619804c807dfa1a942753efde
 DIST xvnkb-0.2.8a.tar.bz2 76221 RMD160 878131517690314cad39210942c81271719fa388 SHA1 898e70d342588f47d9c7d21b3d26a702f97d7f89 SHA256 3503ef1d24041cccc447f5f93025945fda07d519a0120183c6b4af9a66e86eb2
 DIST xvnkb-0.2.9a.tar.bz2 76429 RMD160 f472cf0b11e11b77100d4098caf9ed79ba17f28f SHA1 21fb2c76437828c2d5b3b3bc5584733d93e2f4ed SHA256 316eccadbf73fac7bf55db3f179ffb985a87f22c48d38cfab87e3dcdb8230cb7
 EBUILD xvnkb-0.2.8a-r1.ebuild 1594 RMD160 f6ede6fb331abc24cbec7997279e0968d59ec43b SHA1 d305782d3adbe55482183ef381058ab6cf2dc964 SHA256 0ffb6c37cd645cc7340cea3f827d6f98bccdb360070ee507eec6c87f5d0def1d
-EBUILD xvnkb-0.2.9a-r1.ebuild 1443 RMD160 a0e22634ed8ac5515040bc5c2499b8a2d1f9d260 SHA1 b2d43d8eedbb4cfd1aad14a48eeb878a9e296be0 SHA256 2bb41e9decc80d44fe3fb2c4522ff788794d6e36305816776f73876d08e3148e
-MISC ChangeLog 2872 RMD160 a534ba6e5c1d5df0b4810ee2e6785370a31b4dc1 SHA1 5ad508b46765686838f6c2263ef04a6d74035a3f SHA256 11281bb54dc763ed52342eeb8ce356f98739978fc8610fd470be6198af74cf30
+EBUILD xvnkb-0.2.9a-r1.ebuild 1525 RMD160 f3e9517330d4648156cbc5ef3541f059175b52ff SHA1 26f8c9d4faa4365f3d088ccf983eed351209ae47 SHA256 fda90c1c3b1faad1ea8b3ecdfea3f1d36d17445d6d08586c6da52bc54a2465ad
+MISC ChangeLog 3007 RMD160 c36dd9fade0715e65c834f72efb875c496234bf8 SHA1 c579cd0d7924ff25da183540d164b833db7acfed SHA256 1722a1cb39d194c9271f93d8e6d24f250040b1cfa8df313600a2f195368da8c9
 MISC metadata.xml 158 RMD160 3852afaaf28a37630993c0442eeb16eaee47d0f7 SHA1 2eb582eae6a2477a9ed984ea45f3b5f649954e54 SHA256 18d71c580f82a389887f4970802b5f40e0a2e4c6019117e64268e008dfb81fc8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJP2W7JAAoJEDYO1FT4VRUUsJkP/2ohkIgvISU6DRmyr15ypnZ6
+ykblG+3EJzyGlci1HXA7T5lcSSjq5MfHgraeIXZU8vogxasajYchH5v4tzJkpZQy
+pjedx4/rVWQ29c38j+Q/rZp+f8C3eHn3ZbW5GOEXRc4ZanfRQ55XLIJuSaF9ydGS
+qGbnW/vYQxsoheSEnM9up9zwgjZDMJuyYonJpTO66L7Bq5omtCuCyTnsPYfDLj/f
+iW2k3FzDBM2zDIjseZt7D/caN/TRpcGKTA88ydcvbjuR6SZ+5JVafYdEzt0/ggDC
+ASOrLcZ05I+vKTaVMJwoc7VDPZrzbv0/fvuvdxZDA9Zh5XjqNtF03OE0rbM870lM
+40wwBDp5FFNCfzf8LGa3M604KadLDjTzYgZq5CuZaDBQGmeYmDGa72Vl+xx50H3H
+eYWMLSnVgxT6WhGIxyQ97fYl1tp4KkDowOYGu46nDDayxjsFz57917zqTVyfIJIi
+GKdl4Ww/WFM5XfL0hr6sONNOJ7OO4u3WAwG+gMzIV3Tb0I4Y4e83h5/oYGElI8ER
+HTGSZUur/SRTD4YRBQQyA5bQ463E8uNKUS5HBHztDMkgJzMwzjO+FZXyeKia1lQN
+u4BCRJzP2monTohaagQ/+B2YovIMGRKcLhs8v5NhZ6ZL5xcYgRIIeDCUmrOphV+y
+8ppCLMp7AKGWIXTvKRhp
+=BU+s
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch b/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch
new file mode 100644
index 000000000000..f089f0dde899
--- /dev/null
+++ b/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch
@@ -0,0 +1,34 @@
+diff --git a/Makefile.common b/Makefile.common
+index 06f0b78..d9f8976 100644
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -19,10 +19,10 @@ all: do-it-all
+ 	$(CC) -fpic $(CFLAGS) $(FPTR) $(VK_OPT) -DVERSION=\"$(VERSION)\" -Wall -I$(XLIB_INC) -c $<
+ 
+ $(CORE): $(CORE_OBJS)
+-	$(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL)
++	$(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL) $(LDFLAGS)
+ 
+ $(GUI): $(GUI_OBJS)
+-	$(CC) $(CFLAGS) $(GUI_OBJS) -o $@ -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS)
++	$(CC) $(CFLAGS) $(GUI_OBJS) -o $@ -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS) $(LDFLAGS)
+ 
+ main: $(CORE) $(GUI)
+ 	@echo >/dev/null
+diff --git a/tools/Makefile.common b/tools/Makefile.common
+index fe16cc1..16ec511 100644
+--- a/tools/Makefile.common
++++ b/tools/Makefile.common
+@@ -16,10 +16,10 @@ all: do-it-all
+ 	$(CC) $(CFLAGS) $(DEFS) -Wall -I$(XLIB_INC) -c $<
+ 
+ xvnkb_ctrl: $(CONTROL_OBJS)
+-	$(CC) $(CFLAGS) -o $@ $(CONTROL_OBJS) -L$(XLIB_PATH) $(LIBS)
++	$(CC) $(CFLAGS) -o $@ $(CONTROL_OBJS) -L$(XLIB_PATH) $(LIBS) $(LDFLAGS)
+ 
+ xvnkb_setup: $(SETUP_OBJS)
+-	$(CC) $(CFLAGS) -o $@ $(SETUP_OBJS) -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS)
++	$(CC) $(CFLAGS) -o $@ $(SETUP_OBJS) -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS) $(LDFLAGS)
+ 
+ main-tools: $(TOOLS)
+ 
diff --git a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
index f298849ed515..51c3e0def87b 100644
--- a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
+++ b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild,v 1.3 2009/01/07 15:33:14 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild,v 1.4 2012/06/14 04:55:10 naota Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -19,6 +19,12 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+}
+
 src_compile() {
 	local myconf