Punt useless Makefile and rewrite src_compile() wrt #337250 by Diego Elio Pettenò

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

4 files changed, 34 insertions, 41 deletions

diff --git a/app-arch/hardlink++/ChangeLog b/app-arch/hardlink++/ChangeLog
index 4b7eef40e585..ec16a047805d 100644
--- a/app-arch/hardlink++/ChangeLog
+++ b/app-arch/hardlink++/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/hardlink++
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/hardlink++/ChangeLog,v 1.5 2008/12/11 21:05:44 robbat2 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/hardlink++/ChangeLog,v 1.6 2012/05/19 10:42:23 ssuominen Exp $
+
+  19 May 2012; Samuli Suominen <ssuominen@gentoo.org> hardlink++-0.02.ebuild,
+  -files/hardlink++-0.02-sane-makefile.patch:
+  Punt useless Makefile and rewrite src_compile() wrt #337250 by Diego Elio
+  Pettenò
 
   11 Dec 2008; Robin H. Johnson <robbat2@gentoo.org>
   +files/hardlink++-0.02-gcc-43-compile-fix.patch, hardlink++-0.02.ebuild:
diff --git a/app-arch/hardlink++/Manifest b/app-arch/hardlink++/Manifest
index b95dda9fcc6b..66bebd550698 100644
--- a/app-arch/hardlink++/Manifest
+++ b/app-arch/hardlink++/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX hardlink++-0.02-gcc-43-compile-fix.patch 300 RMD160 370fff575a81e8a9c2adf674cd39d5b0a8934e25 SHA1 8be06683b6e850561173a7bc6f31bf82b1c16e09 SHA256 48f7eb3ae07305f7e95b436cd40150e97c5e0c6bf053a5d06fd3f81e437840f7
 AUX hardlink++-0.02-gcc34-optimize-help.patch 1877 RMD160 7e86c96b9a14aa9567c84aea67d4900d89963a84 SHA1 ae14891ec3d942f4292c90127a6aaffcab1233c7 SHA256 b9cd15d3b7284712eb48f7fd0038979a24b866f6f40f46e5024a3b89d236b657
-AUX hardlink++-0.02-sane-makefile.patch 413 RMD160 7786c1a328ff90df2737952e2e81291de23708bb SHA1 7904a72adc13a684fd2eee89de095603bd6b86a7 SHA256 a234b21f8b2fa51d253207ae0a9bb43f955e9e359b5365a347aa85a0f0d8be02
 DIST hardlink++-0.02.tgz 12228 RMD160 249b91706b0203945786c6a0ae25d1d9350b4384 SHA1 7a9cf4f7711cb30c1d0a49f4e0e7e7d06cf27000 SHA256 1f5c80fa3e62d1d3281c2649fde38dfb7700e8b29fedab54e42e83f3d2959182
-EBUILD hardlink++-0.02.ebuild 827 RMD160 939201a63386e4e0ca01db8817a30b59fbe7876b SHA1 e02300e37fd4c4f05c226ef120f5c677817b7283 SHA256 41df492f6f9e714d5a973aa1d4abe64e8a692187a42de10093e8a78ef190be3a
-MISC ChangeLog 975 RMD160 d9513c61faed2ca1482c249014e7fbde3462d5eb SHA1 e10dade34ab42b03c782c08a981e86674f1f54f0 SHA256 22a5ab0071db7f81924ae33d1f91d45eaa39ad947f80a37dfa58a77c740c735a
+EBUILD hardlink++-0.02.ebuild 735 RMD160 cfc584dba4ae8b38b2afde994c0d90fbec748f46 SHA1 213f17c0ee14052833d83b970c5c333302be83ea SHA256 e4759976695537dbf56dab739cbfb655faabf989f233f80b4d5d3e5daeea1e4f
+MISC ChangeLog 1189 RMD160 2ef868d5e2b8be02ba992fb64ae38257de77c2d9 SHA1 aee2779ca6e2e809331969ad145dc33a806beb7d SHA256 c6f890ec3fc5c76520a20271eeea337ba0326b4e42cd20a5ef81b5b64afd6ede
 MISC metadata.xml 202 RMD160 ca69c6e7044d6681415f1e86a1c084f890ff08ef SHA1 62ab18bf0e1da311494ca0912e5a79daeceb46ad SHA256 76dbb4a720140d78f0ddfb2b2782c03852169c201c1f507eb17ef4d2a82f212a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk589zAACgkQfXuS5UK5QB1AoQQAn8k2Yvmd7xM5DDc6x5dJXR6+
-ixkrQK3eJqps9X7SnqUUu5h/JuPHwppuNguusBFQxHKXOm0Etm3i/7VNap3K27w7
-bTdDlpCg7ISx3/pIP47KHMgVFJ64pJfKIgN9DrhcyQzitn6K2aOjKxY2L4IGXzI0
-lL0uFZnUUjNN7i3DTOs=
-=iVep
+iQEcBAEBAgAGBQJPt3kEAAoJEEdUh39IaPFNmMgH/iy1+Ilyl5kCNEHmEgZNIiNS
+E/Qqhk27vBX2YWERfOSDyLMYTBdklATe8zQFq27aFYrFNHFN3Nwvrp1hG3hUMPP1
+nxY4M+c1I2qfsiG+u5cAmd48KFdbciKNDMAUFDl4sSMLLqMpkkJQamJZV822NDNI
+XDV9cXcYU7zH4l6OxLtkz6as+1EdYCA8cWIgPejsYZiYGiv+m0110KOVUItiaLil
+zdRz1MDhOIepx2qhoQMMjnwagBHoW4ZPNS0hxrYCvZtTeYwAD3n62ZvCBCjErgSZ
+Phej85gtWHkv8WQGll49i8M2YBqZ7wMQdg313zPUvWhBY5AwJSt9GdxJ4p2wIBc=
+=T4xP
 -----END PGP SIGNATURE-----
diff --git a/app-arch/hardlink++/files/hardlink++-0.02-sane-makefile.patch b/app-arch/hardlink++/files/hardlink++-0.02-sane-makefile.patch
deleted file mode 100644
index b81ac3375b07..000000000000
--- a/app-arch/hardlink++/files/hardlink++-0.02-sane-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nuar hardlink++-0.02.orig/Makefile hardlink++-0.02/Makefile
---- hardlink++-0.02.orig/Makefile	2003-08-14 12:59:21.000000000 -0700
-+++ hardlink++-0.02/Makefile	2005-01-29 20:00:47.618746992 -0800
-@@ -1,2 +1,7 @@
--hardlink++: hardlink.cpp hardlink.h
--	g++ -Wall -o hardlink++ hardlink.cpp
-+CXX := g++
-+CXXFLAGS := 
-+BIN := hardlink++
-+SRC := hardlink.cpp
-+
-+$(BIN): $(SRC)
-+	$(CXX) -Wall $(CXXFLAGS) -o $@ $^
diff --git a/app-arch/hardlink++/hardlink++-0.02.ebuild b/app-arch/hardlink++/hardlink++-0.02.ebuild
index 68cd3a73ac9e..58923780fad0 100644
--- a/app-arch/hardlink++/hardlink++-0.02.ebuild
+++ b/app-arch/hardlink++/hardlink++-0.02.ebuild
@@ -1,32 +1,32 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/hardlink++/hardlink++-0.02.ebuild,v 1.4 2008/12/11 21:05:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/hardlink++/hardlink++-0.02.ebuild,v 1.5 2012/05/19 10:42:23 ssuominen Exp $
 
-inherit eutils
-DESCRIPTION="Save disk space by hardlinking identical files."
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Save disk space by hardlinking identical files"
 HOMEPAGE="http://www.sodarock.com/hardlink/"
-SRC_URI="${HOMEPAGE}/${P}.tgz"
+SRC_URI="mirror://gentoo/${P}.tgz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
-DEPEND="sys-devel/gcc"
-RDEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-gcc34-optimize-help.patch || die
-	epatch "${FILESDIR}"/${P}-sane-makefile.patch || die
-	epatch "${FILESDIR}"/${P}-gcc-43-compile-fix.patch || die
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc34-optimize-help.patch \
+		"${FILESDIR}"/${P}-gcc-43-compile-fix.patch
+
+	rm -f Makefile
 }
 
 src_compile() {
-	# no configure
-	emake CXXFLAGS="${CXXFLAGS}" || die "emake failed"
+	$(tc-getCXX) ${LDFLAGS} ${CXXFLAGS} hardlink.cpp -o ${PN}
 }
 
 src_install() {
-	into /usr
-	dobin hardlink++
+	dobin ${PN}
 	dodoc README
 }