Backport CFLAGS fix wrt bug #452088, drop old version

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

3 files changed, 19 insertions, 50 deletions

diff --git a/sys-cluster/ploop/ChangeLog b/sys-cluster/ploop/ChangeLog
index 9f8a82fe85fa..cab1359f08f5 100644
--- a/sys-cluster/ploop/ChangeLog
+++ b/sys-cluster/ploop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/ploop
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ploop/ChangeLog,v 1.13 2013/04/30 12:31:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ploop/ChangeLog,v 1.14 2013/05/02 13:53:30 pinkbyte Exp $
+
+  02 May 2013; Sergey Popov <pinkbyte@gentoo.org> -ploop-1.2.ebuild,
+  ploop-1.4.ebuild:
+  Backport CFLAGS fix wrt bug #452088, drop old version
 
   30 Apr 2013; Agostino Sarubbo <ago@gentoo.org> ploop-1.4.ebuild:
   Stable for x86, wrt bug #467760
diff --git a/sys-cluster/ploop/ploop-1.2.ebuild b/sys-cluster/ploop/ploop-1.2.ebuild
deleted file mode 100644
index 0ef90d52028a..000000000000
--- a/sys-cluster/ploop/ploop-1.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ploop/ploop-1.2.ebuild,v 1.2 2013/01/15 11:44:41 pinkbyte Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="openvz tool and a library to control ploop block devices"
-HOMEPAGE="http://wiki.openvz.org/Download/ploop"
-SRC_URI="http://download.openvz.org/utils/ploop/${PV}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="dev-libs/libxml2"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Respect CFLAGS and CC
-	sed -e 's|CFLAGS =|CFLAGS +=|' -e "s|\(CC=\).*|\1$(tc-getCC)|" \
-		-i Makefile.inc || die
-	# Avoid striping of binaries
-	sed -e '/INSTALL/{s: -s::}' -i tools/Makefile || die
-	epatch "${FILESDIR}/ploop-1.2-soname.patch"
-
-	# respect AR and RANLIB, bug #452092
-	tc-export AR RANLIB
-	sed -i -e 's/ranlib/$(RANLIB)/' lib/Makefile || die 'sed on lib/Makefile failed'
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc tools/README
-	ldconfig -n "${D}/usr/lib/" || die
-}
diff --git a/sys-cluster/ploop/ploop-1.4.ebuild b/sys-cluster/ploop/ploop-1.4.ebuild
index 28467457caab..24aa0501da94 100644
--- a/sys-cluster/ploop/ploop-1.4.ebuild
+++ b/sys-cluster/ploop/ploop-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ploop/ploop-1.4.ebuild,v 1.4 2013/04/30 12:31:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ploop/ploop-1.4.ebuild,v 1.5 2013/05/02 13:53:30 pinkbyte Exp $
 
 EAPI=4
 
@@ -12,18 +12,25 @@ SRC_URI="http://download.openvz.org/utils/ploop/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-libs/libxml2"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	# Respect CFLAGS and CC
-	sed -e 's|CFLAGS =|CFLAGS +=|' -e "s|\(CC=\).*|\1$(tc-getCC)|" \
-		-i Makefile.inc || die
+	# Respect CFLAGS and CC, do not add debug by default
+	sed -i \
+		-e 's|CFLAGS =|CFLAGS +=|' \
+		-e '/CFLAGS/s/-g -O0 //' \
+		-e '/CFLAGS/s/-O2//' \
+		-e 's|CC=|CC?=|' \
+		-e 's/-Werror//' \
+		-e '/DEBUG=yes/d' \
+		Makefile.inc || die 'sed on Makefile.inc failed'
 	# Avoid striping of binaries
-	sed -e '/INSTALL/{s: -s::}' -i tools/Makefile || die
+	sed -e '/INSTALL/{s: -s::}' -i tools/Makefile || die 'sed on tools/Makefile failed'
+
 	epatch "${FILESDIR}/ploop-1.2-soname.patch"
 
 	# respect AR and RANLIB, bug #452092
@@ -32,7 +39,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake V=1
+	emake CC="$(tc-getCC)" V=1
 }
 
 src_install() {