explicitly set PREFIX variable

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)

4 files changed, 8 insertions, 47 deletions

diff --git a/app-portage/deltup/ChangeLog b/app-portage/deltup/ChangeLog
index 651453529085..05d311434793 100644
--- a/app-portage/deltup/ChangeLog
+++ b/app-portage/deltup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-portage/deltup
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/deltup/ChangeLog,v 1.31 2015/03/12 23:03:03 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/deltup/ChangeLog,v 1.32 2015/03/13 02:02:33 dlan Exp $
+
+  13 Mar 2015; Yixun Lan <dlan@gentoo.org> deltup-0.4.6.ebuild,
+  -files/deltup-0.4.4-CFLAGS.patch, -files/deltup-0.4.6-fix-prefix.patch:
+  explicitly set PREFIX variable
 
 *deltup-0.4.6 (12 Mar 2015)
 
diff --git a/app-portage/deltup/deltup-0.4.6.ebuild b/app-portage/deltup/deltup-0.4.6.ebuild
index fd8b3706ddf9..8aaa6f9cc133 100644
--- a/app-portage/deltup/deltup-0.4.6.ebuild
+++ b/app-portage/deltup/deltup-0.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/deltup/deltup-0.4.6.ebuild,v 1.1 2015/03/12 23:03:03 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/deltup/deltup-0.4.6.ebuild,v 1.2 2015/03/13 02:02:33 dlan Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}
 	|| ( dev-util/bdelta =dev-util/xdelta-1* )"
 
 src_prepare () {
-	epatch "${FILESDIR}"/${P}-fix-prefix.patch
+	default
 	epatch_user
 }
 
@@ -34,7 +34,7 @@ src_compile () {
 }
 
 src_install () {
-	default
+	emake DESTDIR="${D}" PREFIX=/usr install
 	dodoc "${S}"/../{README,ChangeLog}
 	doman "${S}"/../deltup.1
 }
diff --git a/app-portage/deltup/files/deltup-0.4.4-CFLAGS.patch b/app-portage/deltup/files/deltup-0.4.4-CFLAGS.patch
deleted file mode 100644
index 31d14d6df7db..000000000000
--- a/app-portage/deltup/files/deltup-0.4.4-CFLAGS.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -NrU5 deltup-0.4.4.original/Makefile deltup-0.4.4/Makefile
---- deltup-0.4.4.original/Makefile	2009-08-02 13:41:03.000000000 -0600
-+++ deltup-0.4.4/Makefile	2009-08-02 15:29:10.000000000 -0600
-@@ -1,26 +1,26 @@
- DESTDIR=
- PREFIX=/usr
- BINDIR=$(PREFIX)/bin
- 
--CC = g++
-+CXX = g++
- 
- objfiles=bpatch.o bzip2.o file.o system.o tmpstore.o deltup.o 
- libs=-lstdc++ -lz -lbz2 -lssl
- 
- #edelta: edelta.cpp deltup
- #	gcc edelta.cpp ${CXXFLAGS} -o edelta
- %.o : %.cpp
--	${CC} -c $< -o $@ -g #-Wall -pedantic #-DFIXED_FRAMERATE
-+	$(CXX) $(CFLAGS) $(LDFLAGS) -c $< -o $@ -g #-Wall -pedantic #-DFIXED_FRAMERATE
- 
- all: deltup
- 
- depend:
--	gcc -MM *.cpp > .depend
-+	$(CXX) -MM *.cpp > .depend
- 	
- deltup: $(objfiles)
--	${CC} $(objfiles) ${CXXFLAGS} -o deltup $(libs)
-+	$(CXX) $(objfiles) $(CFLAGS) $(LDFLAGS) -o deltup $(libs)
- 
- install: deltup
- 	mkdir -p $(DESTDIR)$(BINDIR)
- 	install -m 755 deltup $(DESTDIR)$(BINDIR)
- 
diff --git a/app-portage/deltup/files/deltup-0.4.6-fix-prefix.patch b/app-portage/deltup/files/deltup-0.4.6-fix-prefix.patch
deleted file mode 100644
index 7104b834e006..000000000000
--- a/app-portage/deltup/files/deltup-0.4.6-fix-prefix.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/Makefile	2014-08-12 21:27:16.000000000 +0430
-+++ src/Makefile.new	2015-03-12 13:31:03.119500449 +0330
-@@ -1,5 +1,5 @@
- DESTDIR=
--PREFIX=%%PREFIX%%
-+PREFIX=/usr
- BINDIR=$(PREFIX)/bin
- 
- CC = g++