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

(Portage version: 2.2_rc11/cvs/Linux 2.6.26-openvz.git-777e816 i686)

4 files changed, 99 insertions, 2 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/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
+