Version bump wrt #191559 and fix bug #184548

Package-Manager: portage-2.1.4_rc10

7 files changed, 173 insertions, 5 deletions

diff --git a/app-misc/detox/ChangeLog b/app-misc/detox/ChangeLog
index a07cfedd4cc3..75780151741a 100644
--- a/app-misc/detox/ChangeLog
+++ b/app-misc/detox/ChangeLog
@@ -1,6 +1,14 @@
 # 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.14 2007/02/21 22:26:39 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/detox/ChangeLog,v 1.15 2007/12/17 18:09:33 armin76 Exp $
+
+*detox-1.2.0_rc3 (17 Dec 2007)
+*detox-1.1.1-r2 (17 Dec 2007)
+
+  17 Dec 2007; Raúl Porcel <armin76@gentoo.org>
+  +files/1.1.1-install-permissions-fix.patch, +detox-1.1.1-r2.ebuild,
+  +detox-1.2.0_rc3.ebuild:
+  Version bump wrt #191559 and fix bug #184548
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/app-misc/detox/Manifest b/app-misc/detox/Manifest
index b3e2eddccac3..43df396a5a88 100644
--- a/app-misc/detox/Manifest
+++ b/app-misc/detox/Manifest
@@ -1,3 +1,7 @@
+AUX 1.1.1-install-permissions-fix.patch 2213 RMD160 a9949d6493911c2fe392315a7295ddb79f9ae754 SHA1 a47704b0ac4b9c1e73041cc6c4e454b4fdde40ba SHA256 30ce87f97bec50a26337ba5c84207db7c7cef3ae1ba6abe5f39868c3df3f5897
+MD5 a65ed7eaef42ee632109009677f30998 files/1.1.1-install-permissions-fix.patch 2213
+RMD160 a9949d6493911c2fe392315a7295ddb79f9ae754 files/1.1.1-install-permissions-fix.patch 2213
+SHA256 30ce87f97bec50a26337ba5c84207db7c7cef3ae1ba6abe5f39868c3df3f5897 files/1.1.1-install-permissions-fix.patch 2213
 AUX detox-1.1.0-destdir.patch 1041 RMD160 b5d815cc5fcaf997693960a8f3b7a0a1e259c439 SHA1 7241b8a8a81b32aa78d1cd253667a6d9e77f845a SHA256 572582014e91d452b91d8fc985fd2f0bb404ae37417d5293495758c6f0dc7a71
 MD5 add7e896e354520ac846d697a60a06fc files/detox-1.1.0-destdir.patch 1041
 RMD160 b5d815cc5fcaf997693960a8f3b7a0a1e259c439 files/detox-1.1.0-destdir.patch 1041
@@ -12,6 +16,7 @@ RMD160 916b05273b024673ecbe59a48c36e3954d87583b files/detox-1.1.1-use-correct-ty
 SHA256 b0201a70d78de61c05d3ebf632e3053ee00289800aa264e195211fef3a7f41cf files/detox-1.1.1-use-correct-type.diff 475
 DIST detox-1.1.0.tar.bz2 53342 RMD160 62741378a4b0582c1f5703f062eefd100829e52b SHA1 3ea97a788450d28b907ad052ad6f01ee63bc98b4 SHA256 34232f4c0d4c2c856b023c669700505f12b30eebdd7cfb594fc5768c114a8d50
 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
 EBUILD detox-1.1.0.ebuild 864 RMD160 67d5ebab3839ba16dc831a2d0b8e782987c79ec3 SHA1 826b67a82be8f90ad83a2fa5ff08481b52911dba SHA256 5fd64755c681175b5ba43e6adc0fbe840e56f994c88cd724d4e113da2b23cde0
 MD5 704c33626e32480864e2c0aa83287741 detox-1.1.0.ebuild 864
 RMD160 67d5ebab3839ba16dc831a2d0b8e782987c79ec3 detox-1.1.0.ebuild 864
@@ -20,14 +25,22 @@ EBUILD detox-1.1.1-r1.ebuild 869 RMD160 4ee56dcfa95aa33bf45760176f1388fa29cb52dc
 MD5 b3dff2bc8c2244fadbf13980a10fdcda detox-1.1.1-r1.ebuild 869
 RMD160 4ee56dcfa95aa33bf45760176f1388fa29cb52dc detox-1.1.1-r1.ebuild 869
 SHA256 5c9e7ccfc5753b25086a10086774a1030c0265791679c464c013100fdf600751 detox-1.1.1-r1.ebuild 869
+EBUILD detox-1.1.1-r2.ebuild 942 RMD160 415368e9f3797cfa3d5f31365ac176662d065e4f SHA1 69c39307f42e73e58b5318071c23faf97f994312 SHA256 15aef4a3a1644e6362f18d263dbad6dd57ae0bdfc9abe2b656230bc682c3abd0
+MD5 86ff20ebd7cc3a3b212755d654732f9f detox-1.1.1-r2.ebuild 942
+RMD160 415368e9f3797cfa3d5f31365ac176662d065e4f detox-1.1.1-r2.ebuild 942
+SHA256 15aef4a3a1644e6362f18d263dbad6dd57ae0bdfc9abe2b656230bc682c3abd0 detox-1.1.1-r2.ebuild 942
 EBUILD detox-1.1.1.ebuild 782 RMD160 fb7a0475824f9aafb6968762d7bc322080724759 SHA1 d135484f71eab9dcd6a904de4a236329cdb42b5e SHA256 057901bca7afedf5140e7f7ca448d7f1f0ed7ce8a18627c4e73aa7012876b8de
 MD5 1c6641d7d8bbabfdb2d7854b388e8786 detox-1.1.1.ebuild 782
 RMD160 fb7a0475824f9aafb6968762d7bc322080724759 detox-1.1.1.ebuild 782
 SHA256 057901bca7afedf5140e7f7ca448d7f1f0ed7ce8a18627c4e73aa7012876b8de detox-1.1.1.ebuild 782
-MISC ChangeLog 1984 RMD160 6c561f9f4b53c3df643571bb8a7c6d1437e11412 SHA1 8aaa90d8a383fb5ef40ddea6e8ba31f9b935dbf5 SHA256 b84889351d6cd8cfb9e6d504206c40c37f9155452c84b7127dbacb83491ff07a
-MD5 f0b6be1a1bb38ac6f0abe3c1b6725ed8 ChangeLog 1984
-RMD160 6c561f9f4b53c3df643571bb8a7c6d1437e11412 ChangeLog 1984
-SHA256 b84889351d6cd8cfb9e6d504206c40c37f9155452c84b7127dbacb83491ff07a ChangeLog 1984
+EBUILD detox-1.2.0_rc3.ebuild 996 RMD160 999e1c1e20a3bbfb2df75ac6bc97959592b973f0 SHA1 00f6f987b5055bfd42212c1f30144e733d1db976 SHA256 579d80018de639a65ba3eb2b313621bd228ac5bb04eec1b047fc00da65dce40e
+MD5 52e477a0117b8c443fbcc629b2436226 detox-1.2.0_rc3.ebuild 996
+RMD160 999e1c1e20a3bbfb2df75ac6bc97959592b973f0 detox-1.2.0_rc3.ebuild 996
+SHA256 579d80018de639a65ba3eb2b313621bd228ac5bb04eec1b047fc00da65dce40e detox-1.2.0_rc3.ebuild 996
+MISC ChangeLog 2242 RMD160 af21642bb24a92736b2192efe4dcb8e6e0860b7d SHA1 5475df52438ab3e5e2e412abbdb77812794b3109 SHA256 f422d164bd4467d8b1a0d15dd16d5f3c6e0389fbae5a4d9eb28d77ee9dd4270f
+MD5 006bcb5619eedfdb5eaeb1d322d99cee ChangeLog 2242
+RMD160 af21642bb24a92736b2192efe4dcb8e6e0860b7d ChangeLog 2242
+SHA256 f422d164bd4467d8b1a0d15dd16d5f3c6e0389fbae5a4d9eb28d77ee9dd4270f ChangeLog 2242
 MISC metadata.xml 166 RMD160 3d2a9b18c5772704bb75deb980cf596b554e2ea1 SHA1 ffcf5509c8606c35fc7582d0c87173c269f06910 SHA256 2d4d52cfc74cd977128bc4431b833f3c3038e042fa56c00857685a40b6b6713f
 MD5 af9e5f1c862895b85c2e4cd98f39e00f metadata.xml 166
 RMD160 3d2a9b18c5772704bb75deb980cf596b554e2ea1 metadata.xml 166
@@ -41,3 +54,9 @@ SHA256 e29e641ad057320f3be95efee0c5c7c4c44fa65f98acf8c892f6a5dbeeda60ef files/di
 MD5 99f5811e5307b57345962d313eac72b7 files/digest-detox-1.1.1-r1 235
 RMD160 e53ce918e353022fdf033781d30fe53b2387d1d1 files/digest-detox-1.1.1-r1 235
 SHA256 e29e641ad057320f3be95efee0c5c7c4c44fa65f98acf8c892f6a5dbeeda60ef files/digest-detox-1.1.1-r1 235
+MD5 99f5811e5307b57345962d313eac72b7 files/digest-detox-1.1.1-r2 235
+RMD160 e53ce918e353022fdf033781d30fe53b2387d1d1 files/digest-detox-1.1.1-r2 235
+SHA256 e29e641ad057320f3be95efee0c5c7c4c44fa65f98acf8c892f6a5dbeeda60ef files/digest-detox-1.1.1-r2 235
+MD5 19d451ed703959cb60d110c0c0cdac9f files/digest-detox-1.2.0_rc3 247
+RMD160 6ce3cbf78add4219c0c443d8c2c5f820d9137669 files/digest-detox-1.2.0_rc3 247
+SHA256 cbeb5a0f14100e92a8dc69cfe784753874a28b06a3928b614169e1f665dc34b7 files/digest-detox-1.2.0_rc3 247
diff --git a/app-misc/detox/detox-1.1.1-r2.ebuild b/app-misc/detox/detox-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..ea7a3c62a4f9
--- /dev/null
+++ b/app-misc/detox/detox-1.1.1-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/detox/detox-1.1.1-r2.ebuild,v 1.1 2007/12/17 18:09:33 armin76 Exp $
+
+inherit eutils
+
+DESCRIPTION="detox safely removes spaces and strange characters from filenames"
+HOMEPAGE="http://detox.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/popt
+	sys-devel/flex
+	sys-devel/bison"
+
+RDEPEND="dev-libs/popt"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-use-correct-type.diff
+	epatch "${FILESDIR}"/${PV}-install-permissions-fix.patch
+}
+
+src_compile() {
+	econf --with-popt || die "econf failed"
+	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/detox-1.2.0_rc3.ebuild b/app-misc/detox/detox-1.2.0_rc3.ebuild
new file mode 100644
index 000000000000..737a2d3a76eb
--- /dev/null
+++ b/app-misc/detox/detox-1.2.0_rc3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2007 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_rc3.ebuild,v 1.1 2007/12/17 18:09:33 armin76 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}"
+
+DEPEND="dev-libs/popt
+	sys-devel/flex
+	sys-devel/bison"
+
+RDEPEND="dev-libs/popt"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+#	epatch "${FILESDIR}"/${P}-use-correct-type.diff
+#	epatch "${FILESDIR}"/${PV}-install-permissions-fix.patch
+}
+
+src_compile() {
+	econf --with-popt || die "econf failed"
+	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/1.1.1-install-permissions-fix.patch b/app-misc/detox/files/1.1.1-install-permissions-fix.patch
new file mode 100644
index 000000000000..84e306ca9d8a
--- /dev/null
+++ b/app-misc/detox/files/1.1.1-install-permissions-fix.patch
@@ -0,0 +1,51 @@
+--- Makefile.in.orig	2007-12-17 18:56:40.000000000 +0100
++++ Makefile.in	2007-12-17 18:58:25.000000000 +0100
+@@ -102,36 +102,36 @@
+ 	${INSTALL} -d ${DESTDIR}${mandir}/man5
+ 	${INSTALL} -d ${DESTDIR}${sysconfdir}
+ 	${INSTALL} -d ${DESTDIR}${datadir}/detox
+-	${INSTALL} detox ${DESTDIR}${bindir}
+-	${INSTALL} detox.1 ${DESTDIR}${mandir}/man1
+-	${INSTALL} detoxrc.5 detox.tbl.5 ${DESTDIR}${mandir}/man5
++	${INSTALL} -m 644 detox ${DESTDIR}${bindir}
++	${INSTALL} -m 644 detox.1 ${DESTDIR}${mandir}/man1
++	${INSTALL} -m 644 detoxrc.5 detox.tbl.5 ${DESTDIR}${mandir}/man5
+ 
+ install-safe-config:
+ 	@if [ ! -f ${DESTDIR}${sysconfdir}/detoxrc ]; then \
+-		${INSTALL} detoxrc ${DESTDIR}${sysconfdir}; \
++		${INSTALL} -m 644 detoxrc ${DESTDIR}${sysconfdir}; \
+ 	else \
+ 		echo "${DESTDIR}${sysconfdir}/detoxrc exists, skipping"; \
+ 	fi
+ 	@if [ ! -f ${DESTDIR}${datadir}/detox/iso8859_1.tbl ]; then \
+-		${INSTALL} iso8859_1.tbl ${DESTDIR}${datadir}/detox; \
++		${INSTALL} -m 644 iso8859_1.tbl ${DESTDIR}${datadir}/detox; \
+ 	else \
+ 		echo "${DESTDIR}${datadir}/detox/iso8859_1.tbl exists, skipping"; \
+ 	fi
+ 	@if [ ! -f ${DESTDIR}${datadir}/detox/unicode.tbl ]; then \
+-		${INSTALL} unicode.tbl ${DESTDIR}${datadir}/detox; \
++		${INSTALL} -m 644 unicode.tbl ${DESTDIR}${datadir}/detox; \
+ 	else \
+ 		echo "${DESTDIR}${datadir}/detox/unicode.tbl exists, skipping"; \
+ 	fi
+ 
+ install-unsafe-config:
+-	${INSTALL} detoxrc ${DESTDIR}${sysconfdir}
+-	${INSTALL} iso8859_1.tbl ${DESTDIR}${datadir}/detox
+-	${INSTALL} unicode.tbl ${DESTDIR}${datadir}/detox
++	${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} detoxrc ${DESTDIR}${sysconfdir}/detoxrc.sample
+-	${INSTALL} iso8859_1.tbl ${DESTDIR}${datadir}/detox/iso8859_1.tbl.sample
+-	${INSTALL} unicode.tbl ${DESTDIR}${datadir}/detox/unicode.tbl.sample
++	${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
+ 
+ clean:
+ 	rm -f *.o core *~ a.out *.core
diff --git a/app-misc/detox/files/digest-detox-1.1.1-r2 b/app-misc/detox/files/digest-detox-1.1.1-r2
new file mode 100644
index 000000000000..5cbaac8a9fd6
--- /dev/null
+++ b/app-misc/detox/files/digest-detox-1.1.1-r2
@@ -0,0 +1,3 @@
+MD5 1219f38e34e56186ff18b3c0aa12bb0d detox-1.1.1.tar.bz2 53871
+RMD160 030bf0795fbfe3050a72cbfb3c90cc083f637daf detox-1.1.1.tar.bz2 53871
+SHA256 2d89b73e6b745b3f09cb1ab8b0ff788c7f458905ae47b8c6fa59ee833b3da9ac detox-1.1.1.tar.bz2 53871
diff --git a/app-misc/detox/files/digest-detox-1.2.0_rc3 b/app-misc/detox/files/digest-detox-1.2.0_rc3
new file mode 100644
index 000000000000..3ce73f4060d3
--- /dev/null
+++ b/app-misc/detox/files/digest-detox-1.2.0_rc3
@@ -0,0 +1,3 @@
+MD5 4d3597dd942e8e875e3cc42851f9e112 detox-1.2.0-rc3.tar.bz2 80989
+RMD160 43bc9be23e05241dcf12d210b2f62814f72604ac detox-1.2.0-rc3.tar.bz2 80989
+SHA256 4e22c2ad0c0ccfbaa64ffb7b87d9c433a1717b5de9f830a7583583ae03a04ea6 detox-1.2.0-rc3.tar.bz2 80989