summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Phillips <write2david@gmail.com>2011-03-06 22:44:31 -0600
committerDavid Phillips <write2david@gmail.com>2011-03-06 22:44:31 -0600
commit37afce774f5ac941fdffe5fa53ca7722ed3df0c7 (patch)
tree3e3af8b01cc3b28f9c02253b7d162828f391bbec
parentTake #3 (diff)
downloadwrite2David-37afce774f5ac941fdffe5fa53ca7722ed3df0c7.tar.gz
write2David-37afce774f5ac941fdffe5fa53ca7722ed3df0c7.tar.bz2
write2David-37afce774f5ac941fdffe5fa53ca7722ed3df0c7.zip
Fix installation part of the ebuild
-rw-r--r--app-portage/bemerge/Manifest2
-rw-r--r--app-portage/bemerge/bemerge-0.4.1.ebuild29
2 files changed, 26 insertions, 5 deletions
diff --git a/app-portage/bemerge/Manifest b/app-portage/bemerge/Manifest
index c6c2a12..51e7b04 100644
--- a/app-portage/bemerge/Manifest
+++ b/app-portage/bemerge/Manifest
@@ -1,3 +1,3 @@
DIST bemerge 4473 RMD160 0d557c158cca2981379b1e840a66eb8750ba3e03 SHA1 0b99615591c90d90ebe225b881cdb6702a44c1d5 SHA256 5eb65dc1a6377185ff3b68a11b6dc519f58a29ac2030566e67be9048231221d4
-EBUILD bemerge-0.4.1.ebuild 622 RMD160 5ba6f39a687844eba7fe1bbed8856ef50b27dfb2 SHA1 fd3845653c772a39305125b79b8a1a8857acfcbe SHA256 6a40e2231c837ad145c33910deaef4bbdf225c5eaf6b49cb4e66e335f611b584
+EBUILD bemerge-0.4.1.ebuild 1220 RMD160 b68e792939f585d8b3c4959466d765e48c989e3a SHA1 ea7c1e465ed0ce32e29ce7c8fe5bf5fd6bdb6953 SHA256 a296a6828f5d46ed4e5520cd2c6061022ae8bb4d14dab3d5ea941c54c1215546
MISC metadata.xml 324 RMD160 f1ec2dd85582b1acd4799c943df634768c022b36 SHA1 1903cedec7efa1c9c65945c8a9777832294e7773 SHA256 5cd0694310a87768365816083fad252af6f7069e2f1141b48edcfbb662c5b086
diff --git a/app-portage/bemerge/bemerge-0.4.1.ebuild b/app-portage/bemerge/bemerge-0.4.1.ebuild
index 511f42d..5182744 100644
--- a/app-portage/bemerge/bemerge-0.4.1.ebuild
+++ b/app-portage/bemerge/bemerge-0.4.1.ebuild
@@ -11,8 +11,10 @@ SRC_URI="https://github.com/write2david/bemerge/raw/master/bemerge"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
+RESTRICT="mirror test"
+
RDEPEND="
sys-process/time
@@ -22,9 +24,28 @@ RDEPEND="
app-admin/checkrestart
"
+
+# bemerge is not distributed as a compressed file, so no need to unpack it using
+# the default src_unpack function in /usr/lib/portage/bin/ebuild.sh
+# So, we'll override it with an empty function.
+# The override will also prevent portage from spitting out an error saying
+# that it can't unpack bemerge because it can't recognize the package format
+
+src_unpack() {
+ true
+}
+
+
src_install() {
- mkdir "${D}"/usr/bin/
- cp "${DISTDIR}"/bemerge "${D}"/usr/bin/
- dosbin bemerge || die "dosbin failed"
+
+ # Download bemerge, with will be auto-placed in the "work" directory,
+ # avaiable for install with "doexe"
+ wget https://github.com/write2david/bemerge/raw/master/bemerge
+
+ # Dictate where the executable will be installed to
+ exeinto /usr/bin
+
+ # Now put the executable in said location
+ doexe bemerge
}