Merge prefix support from prefix overlay

Package-Manager: portage-2.2.0_alpha23_p5/cvs/Linux i686

4 files changed, 50 insertions, 8 deletions

diff --git a/app-crypt/rotix/ChangeLog b/app-crypt/rotix/ChangeLog
index 38e0e966c8be..ca7d9a4dba46 100644
--- a/app-crypt/rotix/ChangeLog
+++ b/app-crypt/rotix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/rotix
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/rotix/ChangeLog,v 1.13 2010/07/16 23:20:29 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/rotix/ChangeLog,v 1.14 2011/03/08 03:00:38 abcd Exp $
+
+  08 Mar 2011; Jonathan Callen <abcd@gentoo.org> rotix-0.83.ebuild,
+  +files/rotix-0.83-interix.patch:
+  Merge prefix support from prefix overlay
 
   16 Jul 2010; Markos Chandras <hwoarang@gentoo.org>
   files/0.83-respect-CFLAGS-and-dont-strip.patch, rotix-0.83.ebuild,
diff --git a/app-crypt/rotix/Manifest b/app-crypt/rotix/Manifest
index 120f67e7f33d..0b177d76fbd6 100644
--- a/app-crypt/rotix/Manifest
+++ b/app-crypt/rotix/Manifest
@@ -1,6 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 0.83-respect-CFLAGS-and-dont-strip.patch 623 RMD160 54961c0c64bca6baa0260ce0a01b5f4fa6a97315 SHA1 996608bd7aacbf9440b4faeafb125227b10dc406 SHA256 f0412f5e697571bfd6a6a42f3415018c41175ae03b73ae1ab6cd93fb9b7b793f
+AUX rotix-0.83-interix.patch 252 RMD160 9c8996ec5cf13b10db2d0e2d06d7a7bb7694969f SHA1 f16ff2cdd2ffddaca1020858d58ca199703b4a35 SHA256 4f9589c0816417a1f1389a3b70e5dc04dc8a4348ba131b3dbdf640c4c2733089
 AUX rotix-0.83-locale.diff 256 RMD160 27d86ea7f64fb8f0f7852ae4e93af610118d0545 SHA1 b39b0afcdc0b2459938dd8265600df466e3036fc SHA256 230fbef9431fa6019e6a465540dcd5447a0e8746db333ed80140ebf0577db695
 DIST rotix-0.83.tar.bz2 14685 RMD160 a7f52710e33d21a502a162b1d3836a83ae95588e SHA1 db886b54ecbe608efdd0e4f97321bcc49216fd23 SHA256 f25eae09e1c6eb95f44aec7a2aeaf9b4822da0304909e70149fda4603f1368bd
-EBUILD rotix-0.83.ebuild 784 RMD160 2cf2ca31d113fffe64f466fd86a560617ced4fc7 SHA1 de70ad64a40a2bd50ebc1490739da7cef1af1c58 SHA256 b5ea738a13fd6d4c9941618a05a19561c9c36884378ab91d20c9bcf865f85a2d
-MISC ChangeLog 1552 RMD160 f8b9d91a43dc6ae5e8f378456cdf473b6bfe5fee SHA1 72305314951b007d95391c34eb0d000bb17a9d0a SHA256 cd214312c2f2cc6246769481e750010956aa95d3879c12d18eb006321b0afb3d
+EBUILD rotix-0.83.ebuild 950 RMD160 559ea5b5cf3f2196b9afba0c3a4fe8450e6c6a36 SHA1 2c796ebbf44f1d6608a16b4e10c81bbc686cbb61 SHA256 59741039d00167e3dcbf6ee988bd402d93bd7ad7f1000ae71504aeb21ae4a981
+MISC ChangeLog 1695 RMD160 0bf5e9a8fab505ecfb43f7e7effd443da5350363 SHA1 b2ea6f5844f46151a9e8da44b0613e64c9e00c7b SHA256 d53afaf8a2d83271f2237debe141187c78f374a0088a6eeed4fd9c3bde3d9472
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNdZviAAoJELHSF2kinlg4sMYQAJFh/w6URT7AON6oArFngPue
+R6qy7kujKgL1g1Tz06CopKZXT7UlvNyeLKQV2EgJ8iWycVhBdXSRCnIJKlZ2971v
+QwcW/FhLz8icxYYRwWJbjwFGW2Sq0PHyOu6Ww0tHf/YVSjeGcbCl6SJhg+WJD8hz
+lqfo8zFVHQ4AldX8okUFPpGw/3NlVMfpNC5zuaCFb7Ee80Oovk0xSxiqDEYrlASR
+ouZTR5TEzj7cQv/8vgW3/GnorjE09/kjzAleMyxH0jdDr7SWu6QWVT5M7aKyMpCp
+ky97DW0fjZ4+RnE1x5vae60V/ZnukY/Zol2pIz6LRR3HEiKlwpdxGOPYMr60xl2I
+WMkqw2pqUlFxdv3VgqUVpsQimnT5kXA+yowaiXXxeZ9MgRXizacKu9zMBOxuFFJ5
+oef6TbV2+UI3m/YfDraUoe6ynDVOxZzJM2bnCnIQ/s9onfGXAgf/dm+O5n6hCAxG
+DGMiZp5+qbzKi+cwNWKa375r8Q1/bq0H9CFRBKKqPK8p/Z2W5efdykKuU4oPgqnV
+dvdX/6j8Pg9lUs6w5j1gSF6SdSbwdRCSHfUmBvqDZi3DvVKkoF38piivfWCRM1Hx
+2MlXkirqfwDhF8WNe2oY6wxFMwnND/ac431MNQu0oFvVbO0YbeALzV3NItrinLM5
+tVRut+3DyYmViq+gQtw3
+=42FT
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/rotix/files/rotix-0.83-interix.patch b/app-crypt/rotix/files/rotix-0.83-interix.patch
new file mode 100644
index 000000000000..b691478582ca
--- /dev/null
+++ b/app-crypt/rotix/files/rotix-0.83-interix.patch
@@ -0,0 +1,15 @@
+--- rotix-0.83.orig/help.c
++++ rotix-0.83/help.c
+@@ -24,8 +24,12 @@
+  * I18N
+ \*/
+ 
++#if I18N
+ #include <libintl.h>
+ #define _(String) gettext (String)
++#else
++#define _(String) (String)
++#endif
+ 
+ /*\
+  *  This function displays the help-information.
diff --git a/app-crypt/rotix/rotix-0.83.ebuild b/app-crypt/rotix/rotix-0.83.ebuild
index b1fbcdd6310c..ac15355c0104 100644
--- a/app-crypt/rotix/rotix-0.83.ebuild
+++ b/app-crypt/rotix/rotix-0.83.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/rotix/rotix-0.83.ebuild,v 1.15 2010/07/16 23:20:29 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/rotix/rotix-0.83.ebuild,v 1.16 2011/03/08 03:00:38 abcd Exp $
 
 EAPI=2
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="Rotix allows you to generate rotational obfuscations."
 HOMEPAGE="http://elektron.its.tudelft.nl/~hemmin98/rotix.html"
@@ -11,7 +11,7 @@ SRC_URI="http://elektron.its.tudelft.nl/~hemmin98/rotix_releases/${P}/${P}.tar.b
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ia64 ppc x86"
+KEYWORDS="amd64 ia64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-devel/gettext"
@@ -20,9 +20,11 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-respect-CFLAGS-and-dont-strip.patch
 	epatch "${FILESDIR}"/${P}-locale.diff
+	epatch "${FILESDIR}"/${P}-interix.patch
 }
 
 src_configure() {
+	use elibc_glibc || append-flags -lintl
 	econf --i18n=1
 }