diff --git a/app-portage/deltup/deltup-0.4.6.ebuild b/app-portage/deltup/deltup-0.4.6-r1.ebuild similarity index 87% rename from app-portage/deltup/deltup-0.4.6.ebuild rename to app-portage/deltup/deltup-0.4.6-r1.ebuild index cdc06476fffe0..9c4ebf21a6585 100644 --- a/app-portage/deltup/deltup-0.4.6.ebuild +++ b/app-portage/deltup/deltup-0.4.6-r1.ebuild @@ -26,13 +26,13 @@ DEPEND=" RDEPEND="${DEPEND} || ( dev-util/bdelta =dev-util/xdelta-1* )" -src_prepare () { - default - epatch_user -} +PATCHES=( + "${FILESDIR}"/${PN}-0.4.6-ldflags.patch + "${FILESDIR}"/${PN}-0.4.6-cxx.patch +) src_compile () { - emake CC=$(tc-getCXX) + emake CXX=$(tc-getCXX) } src_install () { diff --git a/app-portage/deltup/files/deltup-0.4.6-cxx.patch b/app-portage/deltup/files/deltup-0.4.6-cxx.patch new file mode 100644 index 0000000000000..6a07dc1ee0a17 --- /dev/null +++ b/app-portage/deltup/files/deltup-0.4.6-cxx.patch @@ -0,0 +1,23 @@ +diff --git a/Makefile b/Makefile +index 6a3aa95..a591a6f 100644 +--- a/Makefile ++++ b/Makefile +@@ -7,3 +7,3 @@ CC = g++ + objfiles=bpatch.o archfunc.o file.o system.o tmpstore.o deltup.o +-libs=-lstdc++ -lz -lbz2 -lcrypto #-lssl ++libs=-lz -lbz2 -lcrypto #-lssl + +@@ -12,3 +12,3 @@ libs=-lstdc++ -lz -lbz2 -lcrypto #-lssl + %.o : %.cpp +- ${CC} -c $< -o $@ ${CXXFLAGS} #-g #-Wall -pedantic ++ ${CXX} -c $< -o $@ ${CXXFLAGS} #-g #-Wall -pedantic + +@@ -17,6 +17,6 @@ all: deltup + depend: +- gcc -MM *.cpp > .depend ++ ${CXX} -MM *.cpp > .depend + + deltup: $(objfiles) +- ${CC} $(objfiles) ${LDFLAGS} -o deltup $(libs) ++ ${CXX} $(objfiles) ${LDFLAGS} -o deltup $(libs) + diff --git a/app-portage/deltup/files/deltup-0.4.6-ldflags.patch b/app-portage/deltup/files/deltup-0.4.6-ldflags.patch new file mode 100644 index 0000000000000..0d06255abcd2c --- /dev/null +++ b/app-portage/deltup/files/deltup-0.4.6-ldflags.patch @@ -0,0 +1,9 @@ +diff --git a/Makefile b/Makefile +index 6a3aa95..6e7c5cf 100644 +--- a/Makefile ++++ b/Makefile +@@ -20,3 +20,3 @@ depend: + deltup: $(objfiles) +- ${CC} $(objfiles) ${CXXFLAGS} -o deltup $(libs) ++ ${CC} $(objfiles) ${LDFLAGS} -o deltup $(libs) +