Version bump, bug #241328, thank pavel sanda for report.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-openvz.git-777e816 i686

5 files changed, 104 insertions, 3 deletions

diff --git a/app-misc/detox/ChangeLog b/app-misc/detox/ChangeLog
index 66c4785d44b4..127b096e336b 100644
--- a/app-misc/detox/ChangeLog
+++ b/app-misc/detox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/detox
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/detox/ChangeLog,v 1.18 2007/12/21 17:25:45 drac Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/detox/ChangeLog,v 1.19 2008/10/14 16:55:49 pva Exp $
+
+*detox-1.2.0 (14 Oct 2008)
+
+  14 Oct 2008; Peter Volkov <pva@gentoo.org>
+  +files/detox-1.2.0-LDFLAGS.patch, +files/detox-1.2.0-parallel.patch,
+  +detox-1.2.0.ebuild:
+  Version bump, bug #241328, thank pavel sanda for report.
 
   21 Dec 2007; Samuli Suominen <drac@gentoo.org>
   files/1.1.1-install-permissions-fix.patch, detox-1.1.1-r2.ebuild:
diff --git a/app-misc/detox/Manifest b/app-misc/detox/Manifest
index 1feb00f5edde..55a5ad78df37 100644
--- a/app-misc/detox/Manifest
+++ b/app-misc/detox/Manifest
@@ -1,8 +1,12 @@
 AUX 1.1.1-install-permissions-fix.patch 2213 RMD160 4c7984c503eae6af4f5b48c8d257518abe0247e7 SHA1 899d4bdc813a42ebd2f59956c685ac8a50063362 SHA256 7ca09de9c483a231aebc2750349a653c8e29eae3654368b3f7883b9cb381ea5c
 AUX detox-1.1.1-use-correct-type.diff 475 RMD160 916b05273b024673ecbe59a48c36e3954d87583b SHA1 bf7054e78ef5e058f73e6e47f7a4277c7a618b2c SHA256 b0201a70d78de61c05d3ebf632e3053ee00289800aa264e195211fef3a7f41cf
+AUX detox-1.2.0-LDFLAGS.patch 501 RMD160 37964fa86b90b28536366d3d470bd4a079b0f56b SHA1 cc259b72899b129752b0a8f2e9ed77b70f6b6f0b SHA256 81302dfb3e792686cb467d7e5889e7c871df927f12770beb4703b713263a1bdc
+AUX detox-1.2.0-parallel.patch 1120 RMD160 fb5461ed985a8018347598cd04841cb8fbf52b99 SHA1 bfc081ae0f73ff0fb14646a428995c1cec281b76 SHA256 a5e06bf299e127e172f4cd58937b9e20f746313e15d4b0ff5e1d03cce3f509c4
 DIST detox-1.1.1.tar.bz2 53871 RMD160 030bf0795fbfe3050a72cbfb3c90cc083f637daf SHA1 6ae16eaf855a13f9aa8d57862b140519d2918b61 SHA256 2d89b73e6b745b3f09cb1ab8b0ff788c7f458905ae47b8c6fa59ee833b3da9ac
 DIST detox-1.2.0-rc3.tar.bz2 80989 RMD160 43bc9be23e05241dcf12d210b2f62814f72604ac SHA1 557c9d991370317d34a789d6172fa2a5570f0cfc SHA256 4e22c2ad0c0ccfbaa64ffb7b87d9c433a1717b5de9f830a7583583ae03a04ea6
+DIST detox-1.2.0.tar.bz2 86118 RMD160 02eb1a5ebc28f6f6e024d58b998758d156002a70 SHA1 cfb88a1adefaf4ee3933baf9a6530c102baa47ce SHA256 abfad90ee7d3e0fc53ce3b9da3253f9a800cdd92e3f8cc12a19394a7b1dcdbf8
 EBUILD detox-1.1.1-r2.ebuild 940 RMD160 afd7c838a794e145ed993d9175bb84de48b23d15 SHA1 a2d6cd7c2849ecb6e5d2982bd827d803cde642db SHA256 7f7df588ecda2ac0ad0311385b9395484ce0b22c65b97b233bc52b5d61457d67
+EBUILD detox-1.2.0.ebuild 934 RMD160 248a38edcecc7bc4aa90bcad3acaafeb1691517f SHA1 6d76260f25dd225bb206672c424942bf63e27d10 SHA256 626692d4b00b440d60b5acd57053a4e2357e36c0f159b12294234a5a4db35edd
 EBUILD detox-1.2.0_rc3.ebuild 844 RMD160 7df8a072a969e8db8f97182e9337fb2501f41030 SHA1 76ab4192aa08cccca2252b0a1a7c2c60b9939085 SHA256 4e8e6310fb620b193348e1e0f900888b202e4bcae7d088a0fbd5043d04db0658
-MISC ChangeLog 2706 RMD160 c45081ebb128c11eb37cea9e8dde21431dbf2bd0 SHA1 04c6de590493f42d65eb2f03e46d41e04087ceed SHA256 f573cc3cb965e9863600d0565b3d541779db51c42de7c9bbf91a8a9bea3cf525
+MISC ChangeLog 2932 RMD160 9a35ae51f28b21e5371bcca1c82e20746b498249 SHA1 a512c904538102fa847f95cbfff9a17945545dca SHA256 9eae89f80ddd01c1c99d1e75f691b71aeb9cefc517e39ed8f55b953376d6c6e3
 MISC metadata.xml 166 RMD160 3d2a9b18c5772704bb75deb980cf596b554e2ea1 SHA1 ffcf5509c8606c35fc7582d0c87173c269f06910 SHA256 2d4d52cfc74cd977128bc4431b833f3c3038e042fa56c00857685a40b6b6713f
diff --git a/app-misc/detox/detox-1.2.0.ebuild b/app-misc/detox/detox-1.2.0.ebuild
new file mode 100644
index 000000000000..369ab0a3daed
--- /dev/null
+++ b/app-misc/detox/detox-1.2.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/detox/detox-1.2.0.ebuild,v 1.1 2008/10/14 16:55:49 pva Exp $
+
+inherit eutils
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="detox safely removes spaces and strange characters from filenames"
+HOMEPAGE="http://detox.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+RDEPEND="dev-libs/popt"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-parallel.patch
+	epatch "${FILESDIR}"/${P}-LDFLAGS.patch
+}
+
+src_compile() {
+	econf --with-popt
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	rm -f "${D}/etc/detoxrc.sample"
+	dodoc README CHANGES
+}
diff --git a/app-misc/detox/files/detox-1.2.0-LDFLAGS.patch b/app-misc/detox/files/detox-1.2.0-LDFLAGS.patch
new file mode 100644
index 000000000000..3f0daa088010
--- /dev/null
+++ b/app-misc/detox/files/detox-1.2.0-LDFLAGS.patch
@@ -0,0 +1,18 @@
+https://sourceforge.net/tracker/index.php?func=detail&aid=2166388&group_id=101612&atid=630105
+
+--- Makefile.in	2008-10-14 16:37:22 +0000
++++ Makefile.in	2008-10-14 16:38:17 +0000
+@@ -70,10 +70,10 @@
+ #
+ 
+ detox: ${detoxOBJS}
+-	${CC} -o detox ${detoxOBJS} ${L_OPT}
++	${CC} ${LDFLAGS} -o detox ${detoxOBJS} ${L_OPT}
+ 
+ inline-detox: ${inline-detoxOBJS}
+-	${CC} -o inline-detox ${inline-detoxOBJS} ${L_OPT}
++	${CC} ${LDFLAGS} -o inline-detox ${inline-detoxOBJS} ${L_OPT}
+ 
+ #
+ # Special Source Compiles
+
diff --git a/app-misc/detox/files/detox-1.2.0-parallel.patch b/app-misc/detox/files/detox-1.2.0-parallel.patch
new file mode 100644
index 000000000000..73abd73d61b3
--- /dev/null
+++ b/app-misc/detox/files/detox-1.2.0-parallel.patch
@@ -0,0 +1,29 @@
+https://sourceforge.net/tracker/index.php?func=detail&aid=2166387&group_id=101612&atid=630105
+
+--- Makefile.in	2008-10-14 16:39:34 +0000
++++ Makefile.in	2008-10-14 16:38:51 +0000
+@@ -131,7 +131,7 @@
+ 	${INSTALL} -m 644 detox.1 ${DESTDIR}${mandir}/man1
+ 	${INSTALL} -m 644 detoxrc.5 detox.tbl.5 ${DESTDIR}${mandir}/man5
+ 
+-install-safe-config:
++install-safe-config: install-base
+ 	@if [ ! -f ${DESTDIR}${sysconfdir}/detoxrc ]; then \
+ 		${INSTALL} -m 644 detoxrc ${DESTDIR}${sysconfdir}; \
+ 	else \
+@@ -148,12 +148,12 @@
+ 		echo "${DESTDIR}${datadir}/detox/unicode.tbl exists, skipping"; \
+ 	fi
+ 
+-install-unsafe-config:
++install-unsafe-config: install-base
+ 	${INSTALL} -m 644 detoxrc ${DESTDIR}${sysconfdir}
+ 	${INSTALL} -m 644 iso8859_1.tbl ${DESTDIR}${datadir}/detox
+ 	${INSTALL} -m 644 unicode.tbl ${DESTDIR}${datadir}/detox
+ 
+-install-sample-config:
++install-sample-config: install-base
+ 	${INSTALL} -m 644 detoxrc ${DESTDIR}${sysconfdir}/detoxrc.sample
+ 	${INSTALL} -m 644 iso8859_1.tbl ${DESTDIR}${datadir}/detox/iso8859_1.tbl.sample
+ 	${INSTALL} -m 644 unicode.tbl ${DESTDIR}${datadir}/detox/unicode.tbl.sample
+