5 files changed, 54 insertions, 35 deletions
diff --git a/dev-cpp/mpfrc++/ChangeLog b/dev-cpp/mpfrc++/ChangeLog
index 0d2aea878..8134c857d 100644
--- a/dev-cpp/mpfrc++/ChangeLog
+++ b/dev-cpp/mpfrc++/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mpfrc++-20120622 (27 Jun 2012)
+
+  27 Jun 2012; Jauhien Piatlicki (jauhien) piatlicki@gmail.com
+  -mpfrc++-20120116.ebuild, +mpfrc++-20120622.ebuild, +files/makefile,
+  -files/Makefile:
+  Version bump for dev-cpp/mpfrc++, thanks to mgorny and Tommy[D]
+
   07 May 2012; Jauhien Piatlicki (jauhien) piatlicki@gmail.com
   mpfrc++-20120116.ebuild:
   dev-cpp/mpfrc++ tested on amd64, keyword added
diff --git a/dev-cpp/mpfrc++/Manifest b/dev-cpp/mpfrc++/Manifest
index 5bb5d30f3..7201e9b32 100644
--- a/dev-cpp/mpfrc++/Manifest
+++ b/dev-cpp/mpfrc++/Manifest
@@ -1,5 +1,5 @@
-AUX Makefile 389 RMD160 87e01a2fa9c3a0fa57662f9df72ec777cbf27987 SHA1 07c18d896976385e40fec031a22d5bd4204fb81f SHA256 550b055c02867eca6e9203cdd8000d44a9915cc0ea24eddb597c42be41e10e6d
-DIST mpfrc++-20120116.tar.gz 77656 RMD160 155d71e1b8c10454ee9034f1ace5d86a3d54c4cd SHA1 91ade20b167be467e4668f5ddc6045f55aaf4c2e SHA256 4b4fba12ad47a5946465244ca2fc9287e3d9b84212ea3738d9ad57cae0ccdaa8
-EBUILD mpfrc++-20120116.ebuild 715 RMD160 6954f7e9d0e6e395f728d8a00373fcf7d92b1c43 SHA1 c9c86ef3299ebcd22a90a951ffc2aff508b8e0f7 SHA256 05087c59c6efa04f6dd35ac52b9b1770130b6a71b350b0bb1ec116b7f616b2d2
-MISC ChangeLog 678 RMD160 50fe259954fafb0e01db766ddb3a6889ed47014b SHA1 7f704617eda938ec7274c0dbed3d80d7a3560227 SHA256 88f5621c53daa7b58cb48153d2eb3eb674c7177292343b967449b06025289cc4
+AUX makefile 745 RMD160 afe9c075f3ecee8cdb06dbe3f6849d1f7895d6df SHA1 7ff554e8230ec9b3f70dba17c0437c147bdc42d4 SHA256 9f9d4bd2cd8893b1d7624abbf68459fbf611d508bffe8d22111a5838989a40f4
+DIST mpfrc++-20120622.tar.gz 25635 RMD160 8c5183b06757bffe71891adeb88c9219b008d70c SHA1 93fc82bcfaee92faa8244c13725c470d2b5d20f4 SHA256 484f6bd3f1358f0afc673ce668311100b7d892ef22161d2458c133e4e6759ad6
+EBUILD mpfrc++-20120622.ebuild 647 RMD160 0b07662e4440421c6581261b1df0c3073f490c1d SHA1 e9205e0d35c7a6e83287eb73b745b2f98c131bb9 SHA256 e4941ada7c3d5d2165700ccd24336c8f9f7f1ea5a8f71582f2c3d6c4c5903fae
+MISC ChangeLog 931 RMD160 84c2cac26efc583e7854d54bc840e6a19bd8b91f SHA1 c54921fa0784824be6764f2bcb486c9d965f6477 SHA256 b2f710eda4ed0484eca850838b8a1f1c8fe0ee5644c45e0a4ac9aebc87aae2d4
 MISC metadata.xml 214 RMD160 efd8175069efb91061298ff4584218b633e44678 SHA1 d372fdbfcb7fd07a4082961d3f3527be4fca1d60 SHA256 c1f09dc7d5313cd2da7b82259c7846ed23144d62b15e59680ada90e2b6b4d154
diff --git a/dev-cpp/mpfrc++/files/Makefile b/dev-cpp/mpfrc++/files/Makefile
deleted file mode 100644
index ce95b5035..000000000
--- a/dev-cpp/mpfrc++/files/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-LNAME=mpfrc++
-VER=20120116
-LIBRARY=lib$(LNAME).so
-REALNAME=$(LIBRARY).$(VER)
-CXX ?= g++
-
-ALL : $(REALNAME)
-
-$(REALNAME) : dlmalloc.o mpreal.o
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $? -lmpfr
-
-mpreal.o: mpreal.cpp mpreal.h
-	$(CXX) $(CXXFLAGS) -fPIC -c mpreal.cpp
-
-dlmalloc.o: dlmalloc.c dlmalloc.h
-	$(CXX) $(CXXFLAGS) -fPIC -c dlmalloc.c
-
-.PHONY: clean
-
-clean:
-	rm -f *.o $(REALNAME)
diff --git a/dev-cpp/mpfrc++/files/makefile b/dev-cpp/mpfrc++/files/makefile
new file mode 100644
index 000000000..3508c24f8
--- /dev/null
+++ b/dev-cpp/mpfrc++/files/makefile
@@ -0,0 +1,38 @@
+LNAME=mpfrc++
+LIBRARY=lib$(LNAME).so
+REALNAME=$(LIBRARY).$(VER)
+CXX ?= g++
+DESTDIR ?=
+LIBDIR ?= $(DESTDIR)/usr/lib
+INCLUDEDIR ?= $(DESTDIR)/usr/include
+
+INSTALL ?= install
+INSTALL_PROG ?= $(INSTALL) -m755
+
+all : $(REALNAME)
+
+$(REALNAME) : mpreal.o
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $? -lmpfr
+
+mpreal.o: mpreal.cpp mpreal.h
+	$(CXX) $(CXXFLAGS) -fPIC -c mpreal.cpp
+
+install: all
+	$(INSTALL) -d $(LIBDIR)
+	$(INSTALL) -d $(INCLUDEDIR)
+	$(INSTALL_PROG) $(REALNAME) $(LIBDIR)/$(REALNAME)
+	$(INSTALL) mpreal.h $(INCLUDEDIR)/mpreal.h
+	cd $(LIBDIR) && ln -s $(REALNAME) $(LIBRARY)
+
+uninstall: .FORCE
+	rm -f $(LIBDIR)/$(LIBRARY)
+	rm -f $(LIBDIR)/$(REALNAME)
+	rm -f $(INCLUDEDIR)/mpreal.h
+
+
+.PHONY: clean
+
+clean:
+	rm -f *.o $(REALNAME)
+
+.FORCE:
diff --git a/dev-cpp/mpfrc++/mpfrc++-20120116.ebuild b/dev-cpp/mpfrc++/mpfrc++-20120622.ebuild
index acbbc96bf..44d81db93 100644
--- a/dev-cpp/mpfrc++/mpfrc++-20120116.ebuild
+++ b/dev-cpp/mpfrc++/mpfrc++-20120622.ebuild
@@ -8,7 +8,7 @@ inherit multilib toolchain-funcs vcs-snapshot
 
 DESCRIPTION="High-performance C++ interface for MPFR library"
 HOMEPAGE="http://www.holoborodko.com/pavel/mpfr/"
-SRC_URI="http://github.com/downloads/jauhien/sources/${P}.tar.gz"
+SRC_URI="mirror://github/jauhien/sources/${P//+/%2B}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -19,16 +19,11 @@ DEPEND="dev-libs/mpfr"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cp "${FILESDIR}/Makefile" Makefile || die
-}
-
-src_compile() {
-	emake CXX="$(tc-getCXX)"
+	cp "${FILESDIR}/makefile" makefile || die
+	tc-export CXX
+	export VER="${PV}"
 }
 
 src_install() {
-	dolib.so lib${PN}.so.${PV}
-	dosym lib${PN}.so.${PV} usr/$(get_libdir)/lib${PN}.so
-	insinto usr/include
-	doins dlmalloc.h mpreal.h
+	emake DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)/" install
 }