From e341a158ffb486e734c1787f4027b04eaf2fdf31 Mon Sep 17 00:00:00 2001
From: Michal Hrušecký <miska@gentoo.org>
Date: Mon, 30 Jul 2012 13:48:45 +0000
Subject: Fixed sed in ebuilds which was fixing paths to make package work
 again.

(Portage version: 2.1.11.9/cvs/Linux x86_64)
---
 dev-util/suse-build/ChangeLog                      | 11 ++++-
 .../suse-build/suse-build-2011.01.20-r1.ebuild     | 52 ++++++++++++++++++++++
 dev-util/suse-build/suse-build-2011.01.20.ebuild   | 52 ----------------------
 .../suse-build/suse-build-2011.09.26-r1.ebuild     | 52 ++++++++++++++++++++++
 dev-util/suse-build/suse-build-2011.09.26.ebuild   | 52 ----------------------
 dev-util/suse-build/suse-build-9999.ebuild         |  4 +-
 6 files changed, 116 insertions(+), 107 deletions(-)
 create mode 100644 dev-util/suse-build/suse-build-2011.01.20-r1.ebuild
 delete mode 100644 dev-util/suse-build/suse-build-2011.01.20.ebuild
 create mode 100644 dev-util/suse-build/suse-build-2011.09.26-r1.ebuild
 delete mode 100644 dev-util/suse-build/suse-build-2011.09.26.ebuild

(limited to 'dev-util')

diff --git a/dev-util/suse-build/ChangeLog b/dev-util/suse-build/ChangeLog
index e54d100ed388..cfe2dde4e8a7 100644
--- a/dev-util/suse-build/ChangeLog
+++ b/dev-util/suse-build/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/suse-build
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/ChangeLog,v 1.4 2012/03/07 13:36:56 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/ChangeLog,v 1.5 2012/07/30 13:48:45 miska Exp $
+
+*suse-build-2011.09.26-r1 (30 Jul 2012)
+*suse-build-2011.01.20-r1 (30 Jul 2012)
+
+  30 Jul 2012; Michal Hrusecky <miska@gentoo.org>
+  -suse-build-2011.01.20.ebuild, +suse-build-2011.01.20-r1.ebuild,
+  -suse-build-2011.09.26.ebuild, +suse-build-2011.09.26-r1.ebuild,
+  suse-build-9999.ebuild:
+  Fixed sed in ebuild that was correcting paths making package work again
 
 *suse-build-2011.09.26 (07 Mar 2012)
 
diff --git a/dev-util/suse-build/suse-build-2011.01.20-r1.ebuild b/dev-util/suse-build/suse-build-2011.01.20-r1.ebuild
new file mode 100644
index 000000000000..118021237b91
--- /dev/null
+++ b/dev-util/suse-build/suse-build-2011.01.20-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/suse-build-2011.01.20-r1.ebuild,v 1.1 2012/07/30 13:48:45 miska Exp $
+
+EAPI=4
+
+EGIT_REPO_URI="git://gitorious.org/opensuse/build.git"
+OPENSUSE_RELEASE="11.4"
+MY_PN="build"
+OBS_PACKAGE="${MY_PN}"
+
+if [[ "${PV}" == "9999" ]]; then
+	EXTRA_ECLASS="git-2"
+else
+	EXTRA_ECLASS="obs-download"
+fi
+
+inherit eutils ${EXTRA_ECLASS}
+unset EXTRA_ECLASS
+
+DESCRIPTION="Script to build SUSE Linux RPMs"
+HOMEPAGE="https://build.opensuse.org/package/show?package=build&project=openSUSE%3ATools"
+
+[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+[[ "${PV}" == "9999" ]] || KEYWORDS="~amd64 ~x86"
+
+RDEPEND="virtual/perl-Digest-MD5
+	virtual/perl-Getopt-Long
+	dev-perl/XML-Parser
+	dev-perl/TimeDate
+	app-shells/bash
+	app-arch/rpm"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() { :; }
+
+src_install() {
+	emake DESTDIR="${D}" pkglibdir=/usr/share/suse-build install
+	cd "${ED}"/usr
+	find bin -type l | while read i; do
+		mv "${i}" "${i/bin\//bin/suse-}"
+	done
+	find share/man/man1 -type f | while read i; do
+		mv "${i}" "${i/man1\//man1/suse-}"
+	done
+	find . -type f -exec sed -i 's|/usr/lib/build|/usr/share/suse-build|' {} +
+}
diff --git a/dev-util/suse-build/suse-build-2011.01.20.ebuild b/dev-util/suse-build/suse-build-2011.01.20.ebuild
deleted file mode 100644
index ae617612d173..000000000000
--- a/dev-util/suse-build/suse-build-2011.01.20.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/suse-build-2011.01.20.ebuild,v 1.3 2012/03/07 13:36:56 miska Exp $
-
-EAPI=4
-
-EGIT_REPO_URI="git://gitorious.org/opensuse/build.git"
-OPENSUSE_RELEASE="11.4"
-MY_PN="build"
-OBS_PACKAGE="${MY_PN}"
-
-if [[ "${PV}" == "9999" ]]; then
-	EXTRA_ECLASS="git-2"
-else
-	EXTRA_ECLASS="obs-download"
-fi
-
-inherit eutils ${EXTRA_ECLASS}
-unset EXTRA_ECLASS
-
-DESCRIPTION="Script to build SUSE Linux RPMs"
-HOMEPAGE="https://build.opensuse.org/package/show?package=build&project=openSUSE%3ATools"
-
-[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-[[ "${PV}" == "9999" ]] || KEYWORDS="~amd64 ~x86"
-
-RDEPEND="virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	dev-perl/XML-Parser
-	dev-perl/TimeDate
-	app-shells/bash
-	app-arch/rpm"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() { :; }
-
-src_install() {
-	emake DESTDIR="${D}" pkglibdir=/usr/share/suse-build install
-	cd "${ED}"/usr
-	find bin -type l | while read i; do
-		mv "${i}" "${i/bin\//bin/suse-}"
-	done
-	find share/man/man1 -type f | while read i; do
-		mv "${i}" "${i/man1\//man1/suse-}"
-	done
-	find . -type f sed -i 's|/usr/lib/build|/usr/share/suse-build|' {} +
-}
diff --git a/dev-util/suse-build/suse-build-2011.09.26-r1.ebuild b/dev-util/suse-build/suse-build-2011.09.26-r1.ebuild
new file mode 100644
index 000000000000..8d4fe4aff171
--- /dev/null
+++ b/dev-util/suse-build/suse-build-2011.09.26-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/suse-build-2011.09.26-r1.ebuild,v 1.1 2012/07/30 13:48:45 miska Exp $
+
+EAPI=4
+
+EGIT_REPO_URI="git://gitorious.org/opensuse/build.git"
+OPENSUSE_RELEASE="12.1"
+MY_PN="build"
+OBS_PACKAGE="${MY_PN}"
+
+if [[ "${PV}" == "9999" ]]; then
+	EXTRA_ECLASS="git-2"
+else
+	EXTRA_ECLASS="obs-download"
+fi
+
+inherit eutils ${EXTRA_ECLASS}
+unset EXTRA_ECLASS
+
+DESCRIPTION="Script to build SUSE Linux RPMs"
+HOMEPAGE="https://build.opensuse.org/package/show?package=build&project=openSUSE%3ATools"
+
+[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+[[ "${PV}" == "9999" ]] || KEYWORDS="~amd64 ~x86"
+
+RDEPEND="virtual/perl-Digest-MD5
+	virtual/perl-Getopt-Long
+	dev-perl/XML-Parser
+	dev-perl/TimeDate
+	app-shells/bash
+	app-arch/rpm"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() { :; }
+
+src_install() {
+	emake DESTDIR="${D}" pkglibdir=/usr/share/suse-build install
+	cd "${ED}"/usr
+	find bin -type l | while read i; do
+		mv "${i}" "${i/bin\//bin/suse-}"
+	done
+	find share/man/man1 -type f | while read i; do
+		mv "${i}" "${i/man1\//man1/suse-}"
+	done
+	find . -type f -exec sed -i 's|/usr/lib/build|/usr/share/suse-build|' {} +
+}
diff --git a/dev-util/suse-build/suse-build-2011.09.26.ebuild b/dev-util/suse-build/suse-build-2011.09.26.ebuild
deleted file mode 100644
index f3261190bd9c..000000000000
--- a/dev-util/suse-build/suse-build-2011.09.26.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/suse-build-2011.09.26.ebuild,v 1.1 2012/03/07 13:36:56 miska Exp $
-
-EAPI=4
-
-EGIT_REPO_URI="git://gitorious.org/opensuse/build.git"
-OPENSUSE_RELEASE="12.1"
-MY_PN="build"
-OBS_PACKAGE="${MY_PN}"
-
-if [[ "${PV}" == "9999" ]]; then
-	EXTRA_ECLASS="git-2"
-else
-	EXTRA_ECLASS="obs-download"
-fi
-
-inherit eutils ${EXTRA_ECLASS}
-unset EXTRA_ECLASS
-
-DESCRIPTION="Script to build SUSE Linux RPMs"
-HOMEPAGE="https://build.opensuse.org/package/show?package=build&project=openSUSE%3ATools"
-
-[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-[[ "${PV}" == "9999" ]] || KEYWORDS="~amd64 ~x86"
-
-RDEPEND="virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	dev-perl/XML-Parser
-	dev-perl/TimeDate
-	app-shells/bash
-	app-arch/rpm"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() { :; }
-
-src_install() {
-	emake DESTDIR="${D}" pkglibdir=/usr/share/suse-build install
-	cd "${ED}"/usr
-	find bin -type l | while read i; do
-		mv "${i}" "${i/bin\//bin/suse-}"
-	done
-	find share/man/man1 -type f | while read i; do
-		mv "${i}" "${i/man1\//man1/suse-}"
-	done
-	find . -type f sed -i 's|/usr/lib/build|/usr/share/suse-build|' {} +
-}
diff --git a/dev-util/suse-build/suse-build-9999.ebuild b/dev-util/suse-build/suse-build-9999.ebuild
index b21edf9cb158..eec17a7c5fc7 100644
--- a/dev-util/suse-build/suse-build-9999.ebuild
+++ b/dev-util/suse-build/suse-build-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/suse-build-9999.ebuild,v 1.3 2012/03/07 13:36:56 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/suse-build-9999.ebuild,v 1.4 2012/07/30 13:48:45 miska Exp $
 
 EAPI=4
 
@@ -48,5 +48,5 @@ src_install() {
 	find share/man/man1 -type f | while read i; do
 		mv "${i}" "${i/man1\//man1/suse-}"
 	done
-	find . -type f sed -i 's|/usr/lib/build|/usr/share/suse-build|' {} +
+	find . -type f -exec sed -i 's|/usr/lib/build|/usr/share/suse-build|' {} +
 }
-- 
cgit v1.2.3-65-gdbad