diff options
| author |   Francesco Riosa <vivo@gentoo.org> | 2005-08-17 12:51:53 +0000 |
|---|---|---|
| committer | Francesco Riosa <vivo@gentoo.org> | 2005-08-17 12:51:53 +0000 |
| commit | aa36b9f3b3d2c932ffa2204bebd3630a957cf5c0 (patch) | |
| tree | b6f1a72fd6867cc962eede527bbaa6d5d8d1fccf /dev-ml/ocaml-mysql | |
| parent | Added dependency on sandbox-1.2.12 due to bug #97441. (diff) | |
| download | gentoo-2-aa36b9f3b3d2c932ffa2204bebd3630a957cf5c0.tar.gz gentoo-2-aa36b9f3b3d2c932ffa2204bebd3630a957cf5c0.tar.bz2 gentoo-2-aa36b9f3b3d2c932ffa2204bebd3630a957cf5c0.zip | |
fix Bug #101349, recreated the patch to apply to the correct file
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'dev-ml/ocaml-mysql')
| -rw-r--r-- | dev-ml/ocaml-mysql/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-ml/ocaml-mysql/Manifest | 3 | ||||
| -rw-r--r-- | dev-ml/ocaml-mysql/files/ocaml-mysql-1.0.3-shtool-r1.patch | 20 | ||||
| -rw-r--r-- | dev-ml/ocaml-mysql/ocaml-mysql-1.0.3-r1.ebuild | 4 |
4 files changed, 29 insertions, 4 deletions
diff --git a/dev-ml/ocaml-mysql/ChangeLog b/dev-ml/ocaml-mysql/ChangeLog index 7a45cf411d72..317f57274abe 100644 --- a/dev-ml/ocaml-mysql/ChangeLog +++ b/dev-ml/ocaml-mysql/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ml/ocaml-mysql # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ChangeLog,v 1.2 2005/06/02 15:11:54 mattam Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ChangeLog,v 1.3 2005/08/17 12:51:53 vivo Exp $ + + 17 Aug 2005; Francesco Riosa <vivo@gentoo.org> + +files/ocaml-mysql-1.0.3-shtool-r1.patch, ocaml-mysql-1.0.3-r1.ebuild: + fix Bug #101349, recreated the patch to apply to the correct file *ocaml-mysql-1.0.3-r1 (02 Jun 2005) diff --git a/dev-ml/ocaml-mysql/Manifest b/dev-ml/ocaml-mysql/Manifest index edb02ff48d4b..31f0e40edbd6 100644 --- a/dev-ml/ocaml-mysql/Manifest +++ b/dev-ml/ocaml-mysql/Manifest @@ -1,8 +1,9 @@ -MD5 46dd087f07d4429af853bc66862b44ce ocaml-mysql-1.0.3-r1.ebuild 897 +MD5 5ac23607816a4bfec4a98806b19620d6 ocaml-mysql-1.0.3-r1.ebuild 900 MD5 53f858c3c552a4aaaab3c9a82ab1031b ocaml-mysql-1.0.3.ebuild 849 MD5 8fa29bb308d9da2c80f8ec7d70397ab8 ChangeLog 676 MD5 648a541494aceee26dbcfd76164f37ea metadata.xml 157 MD5 d136e53521c22eb8b9f2987dfd19163d files/ocaml-mysql-1.0.3-shtool.patch 744 +MD5 17d44e73eabd032735c409db133e8f19 files/ocaml-mysql-1.0.3-shtool-r1.patch 608 MD5 000615b1a5a0999a580efdd6dadad829 files/ocaml-mysql-1.0.3-head.patch 1635 MD5 d6862e23b576fefef089e739a132cd16 files/digest-ocaml-mysql-1.0.3 69 MD5 d6862e23b576fefef089e739a132cd16 files/digest-ocaml-mysql-1.0.3-r1 69 diff --git a/dev-ml/ocaml-mysql/files/ocaml-mysql-1.0.3-shtool-r1.patch b/dev-ml/ocaml-mysql/files/ocaml-mysql-1.0.3-shtool-r1.patch new file mode 100644 index 000000000000..b76fa30f0d08 --- /dev/null +++ b/dev-ml/ocaml-mysql/files/ocaml-mysql-1.0.3-shtool-r1.patch @@ -0,0 +1,20 @@ +diff -Naur a/etc/shtool b/etc/shtool +--- a/etc/shtool 2005-08-17 14:21:24.000000000 +0200 ++++ b/etc/shtool 2005-08-17 14:25:01.000000000 +0200 +@@ -378,8 +378,14 @@ + tmpdir="$TEMPDIR" + fi + fi +- tmpfile="$tmpdir/.shtool.$$" +- rm -f $tmpfile >/dev/null 2>&1 ++ if mkdir "$tmpdir/.shtool.$$"; then ++ tmpfile="$tmpdir/.shtool.$$/shtool.tmp" ++ else ++ echo "$msgprefix:Error: failed to create temporary file" 1>&2 ++ exit 1 ++ fi ++ tmpfile="$tmpdir/.shtool.$$/shtool.tmp" ++ rm -fr "$tmpdir/.shtool.$$" >/dev/null 2>&1 || true + touch $tmpfile + fi + diff --git a/dev-ml/ocaml-mysql/ocaml-mysql-1.0.3-r1.ebuild b/dev-ml/ocaml-mysql/ocaml-mysql-1.0.3-r1.ebuild index d665deaff73a..d5ed9ad21a18 100644 --- a/dev-ml/ocaml-mysql/ocaml-mysql-1.0.3-r1.ebuild +++ b/dev-ml/ocaml-mysql/ocaml-mysql-1.0.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ocaml-mysql-1.0.3-r1.ebuild,v 1.1 2005/06/02 15:11:54 mattam Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ocaml-mysql-1.0.3-r1.ebuild,v 1.2 2005/08/17 12:51:53 vivo Exp $ inherit findlib eutils @@ -22,7 +22,7 @@ KEYWORDS="x86 ppc" src_compile() { epatch ${FILESDIR}/${P}-head.patch - epatch ${FILESDIR}/${P}-shtool.patch + epatch ${FILESDIR}/${P}-shtool-r1.patch econf || die "configure failed" make all || die "make failed" make opt |