Fix bug 259434, smuxi enters an infinite loop when compiling on milli-second-precision FSes, suchs as tmpfs or XFS.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

4 files changed, 88 insertions, 5 deletions

diff --git a/net-irc/smuxi/ChangeLog b/net-irc/smuxi/ChangeLog
index dd8ec44dcc44..6a20272af4fe 100644
--- a/net-irc/smuxi/ChangeLog
+++ b/net-irc/smuxi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/smuxi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/smuxi/ChangeLog,v 1.1 2009/01/31 22:19:26 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/smuxi/ChangeLog,v 1.2 2009/04/05 21:20:02 loki_val Exp $
+
+  05 Apr 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/smuxi-0.6.3-infinite-loop.patch, smuxi-0.6.3.ebuild:
+  Fix bug 259434, smuxi enters an infinite loop when compiling on
+  milli-second-precision FSes, suchs as tmpfs or XFS.
 
 *smuxi-0.6.3 (31 Jan 2009)
 
diff --git a/net-irc/smuxi/Manifest b/net-irc/smuxi/Manifest
index a1dcc8e7e857..bcd7390bcd29 100644
--- a/net-irc/smuxi/Manifest
+++ b/net-irc/smuxi/Manifest
@@ -1,5 +1,6 @@
+AUX smuxi-0.6.3-infinite-loop.patch 3019 RMD160 12cd692df7e017ae8dfd1e2bef38b9631eeccb3a SHA1 9ea5c7114d699c16513377a36fff968901e43716 SHA256 b96bc4eb83e68249edb03a3e6b2213ecd8bcac9bb7e763646c5bf7c7621e9e02
 AUX smuxi-0.6.3-mono-2.2.patch 982 RMD160 e33dc0139d4b94225ebb71bc85fd64652e7152f3 SHA1 863a24f3f27113d77cb657719123d45e8312e36b SHA256 86c8640c5fae959496504119aba1fcf7c7a28c20b6ce37e8da8a6974afd03c81
 DIST smuxi-0.6.3.tar.gz 906997 RMD160 1a14b8190629c99e76777f6f1cee408e8a6140df SHA1 cbdd87e5d6ceaff3520de789185aa9b24ba83eb0 SHA256 ae75dbd729f616eb360f97c5d47430e05662fa8d7c44940210f7c5c36b18b97b
-EBUILD smuxi-0.6.3.ebuild 1172 RMD160 1b16edcee74534c399eb89e6d891798567a99051 SHA1 cfcb74a37e748edc5a212d5731061c935fd1cf46 SHA256 01a660aa17010b7a9cffe74c424878a904b5cc2ba8827baff70bc339f3bf06b5
-MISC ChangeLog 388 RMD160 c8ebd9a64dad9ef1ce58adc2d75291cbc1a051cb SHA1 bede0a5c4aabf77c9a941d8a6f7c820bbeeca184 SHA256 02fa50e388a21480770a9ebcdd75d49e1bc3107c66e3b9ac501bc5cc9cbdcee6
+EBUILD smuxi-0.6.3.ebuild 1212 RMD160 7159f1dd028381ea384f3c954eba1999a6e44b89 SHA1 f1ee385dd1e3be6462ba720c6df9fe0c81f0984c SHA256 47f4950943a6081150e23201bc16b6846ccd47dcce31e1407e0075063f10d406
+MISC ChangeLog 624 RMD160 41e7789a8390f6201f77756fe67667141600d050 SHA1 ab7708523cf6164baac64ccf2abd2488d029de86 SHA256 0f3959b40a3706e92e985b7520ed2389b429c2f721c59fb1bed091b25d548df1
 MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687
diff --git a/net-irc/smuxi/files/smuxi-0.6.3-infinite-loop.patch b/net-irc/smuxi/files/smuxi-0.6.3-infinite-loop.patch
new file mode 100644
index 000000000000..7ff07123ebdf
--- /dev/null
+++ b/net-irc/smuxi/files/smuxi-0.6.3-infinite-loop.patch
@@ -0,0 +1,76 @@
+From: Mirco Bauer <meebey@meebey.net>
+Date: Sun, 5 Apr 2009 20:34:13 +0000 (+0200)
+Subject: set subdir variable to "po" in all po-*/Makefile.in.in files
+X-Git-Url: http://git.qnetp.net/?p=smuxi.git;a=commitdiff_plain;h=81669b0fcb404562d9d0da99d9605b3f64c07af2
+
+set subdir variable to "po" in all po-*/Makefile.in.in files
+
+This doesn't really make sense to me as that causes to always stamp the same file (po/stamp-it) instead of each po directory, but this is how intltoolize wants it.
+At the same time this finally fixes the endless build loop if the source files are laying on xfs or tmpfs (which support more precise timestamps). (closes: #156)
+---
+
+diff --git a/po-Engine-IRC/Makefile.in.in b/po-Engine-IRC/Makefile.in.in
+index 27268fc..3add1c1 100644
+--- a/po-Engine-IRC/Makefile.in.in
++++ b/po-Engine-IRC/Makefile.in.in
+@@ -35,7 +35,7 @@ datarootdir = @datarootdir@
+ libdir = @libdir@
+ DATADIRNAME = @DATADIRNAME@
+ itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+-subdir = po-Engine-IRC
++subdir = po
+ install_sh = @install_sh@
+ # Automake >= 1.8 provides @mkdir_p@.
+ # Until it can be supposed, use the safe fallback:
+diff --git a/po-Engine/Makefile.in.in b/po-Engine/Makefile.in.in
+index b84aa3a..2ec381e 100644
+--- a/po-Engine/Makefile.in.in
++++ b/po-Engine/Makefile.in.in
+@@ -35,7 +35,7 @@ datarootdir = @datarootdir@
+ libdir = @libdir@
+ DATADIRNAME = @DATADIRNAME@
+ itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+-subdir = po-Engine
++subdir = po
+ install_sh = @install_sh@
+ # Automake >= 1.8 provides @mkdir_p@.
+ # Until it can be supposed, use the safe fallback:
+diff --git a/po-Frontend-GNOME-IRC/Makefile.in.in b/po-Frontend-GNOME-IRC/Makefile.in.in
+index 70d5713..5f70427 100644
+--- a/po-Frontend-GNOME-IRC/Makefile.in.in
++++ b/po-Frontend-GNOME-IRC/Makefile.in.in
+@@ -35,7 +35,7 @@ datarootdir = @datarootdir@
+ libdir = @libdir@
+ DATADIRNAME = @DATADIRNAME@
+ itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+-subdir = po-Frontend-GNOME-IRC
++subdir = po
+ install_sh = @install_sh@
+ # Automake >= 1.8 provides @mkdir_p@.
+ # Until it can be supposed, use the safe fallback:
+diff --git a/po-Frontend-GNOME/Makefile.in.in b/po-Frontend-GNOME/Makefile.in.in
+index 1e74fca..9567482 100644
+--- a/po-Frontend-GNOME/Makefile.in.in
++++ b/po-Frontend-GNOME/Makefile.in.in
+@@ -35,7 +35,7 @@ datarootdir = @datarootdir@
+ libdir = @libdir@
+ DATADIRNAME = @DATADIRNAME@
+ itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+-subdir = po-Frontend-GNOME
++subdir = po
+ install_sh = @install_sh@
+ # Automake >= 1.8 provides @mkdir_p@.
+ # Until it can be supposed, use the safe fallback:
+diff --git a/po-Server/Makefile.in.in b/po-Server/Makefile.in.in
+index 925fe32..edffc6e 100644
+--- a/po-Server/Makefile.in.in
++++ b/po-Server/Makefile.in.in
+@@ -35,7 +35,7 @@ datarootdir = @datarootdir@
+ libdir = @libdir@
+ DATADIRNAME = @DATADIRNAME@
+ itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+-subdir = po-Server
++subdir = po
+ install_sh = @install_sh@
+ # Automake >= 1.8 provides @mkdir_p@.
+ # Until it can be supposed, use the safe fallback:
diff --git a/net-irc/smuxi/smuxi-0.6.3.ebuild b/net-irc/smuxi/smuxi-0.6.3.ebuild
index 27abdc7c0e43..cb820e153bb7 100644
--- a/net-irc/smuxi/smuxi-0.6.3.ebuild
+++ b/net-irc/smuxi/smuxi-0.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/smuxi/smuxi-0.6.3.ebuild,v 1.4 2009/02/01 11:21:41 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/smuxi/smuxi-0.6.3.ebuild,v 1.5 2009/04/05 21:20:02 loki_val Exp $
 
 EAPI="2"
 
@@ -29,7 +29,8 @@ DEPEND="${RDEPEND}
 	>=sys-devel/gettext-0.17
 	>=dev-util/pkgconfig-0.23"
 
-PATCHES=( "${FILESDIR}/${P}-mono-2.2.patch" )
+PATCHES=( "${FILESDIR}/${P}-mono-2.2.patch"
+	"${FILESDIR}/${P}-infinite-loop.patch" )
 
 src_configure() {
 	econf	--disable-dependency-tracking	\