summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2009-08-16 11:11:40 +0000
committerJustin Lecher <jlec@gentoo.org>2009-08-16 11:11:40 +0000
commitac61623f29f0811a4cc95dccc9e08ad4e7db832b (patch)
tree0b7bf54b23e746b50ac577b50cdf0d2b920a5cc1 /x11-misc/xorg-edit
parentx11-misc/xorg-edit: Make it build in parallel (diff)
downloadsunrise-ac61623f29f0811a4cc95dccc9e08ad4e7db832b.tar.gz
sunrise-ac61623f29f0811a4cc95dccc9e08ad4e7db832b.tar.bz2
sunrise-ac61623f29f0811a4cc95dccc9e08ad4e7db832b.zip
x11-misc/xorg-edit: src_install fixed
svn path=/sunrise/; revision=9026
Diffstat (limited to 'x11-misc/xorg-edit')
-rw-r--r--x11-misc/xorg-edit/ChangeLog4
-rw-r--r--x11-misc/xorg-edit/Manifest6
-rw-r--r--x11-misc/xorg-edit/files/xorg-edit-08.08.06-makefile.patch31
-rw-r--r--x11-misc/xorg-edit/xorg-edit-08.08.06.ebuild4
4 files changed, 36 insertions, 9 deletions
diff --git a/x11-misc/xorg-edit/ChangeLog b/x11-misc/xorg-edit/ChangeLog
index 0f7f595bd..55bbf8d48 100644
--- a/x11-misc/xorg-edit/ChangeLog
+++ b/x11-misc/xorg-edit/ChangeLog
@@ -3,6 +3,10 @@
# $Header: $
16 Aug 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+ xorg-edit-08.08.06.ebuild, files/xorg-edit-08.08.06-makefile.patch:
+ src_install fixed
+
+ 16 Aug 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
files/xorg-edit-08.08.06-makefile.patch:
Make it build in parallel
diff --git a/x11-misc/xorg-edit/Manifest b/x11-misc/xorg-edit/Manifest
index 14ccdb88c..31ec93d51 100644
--- a/x11-misc/xorg-edit/Manifest
+++ b/x11-misc/xorg-edit/Manifest
@@ -1,5 +1,5 @@
-AUX xorg-edit-08.08.06-makefile.patch 1468 RMD160 da084dc469e77a7ec14db9b41a1030af6f33bfc0 SHA1 fe972a5470ea7a6eb1d85cb20d143591e9901b25 SHA256 5e6ebef8d9cf5c7bbf8ba64f4178ed2dcd41b43d6e063003c617d073d167149c
+AUX xorg-edit-08.08.06-makefile.patch 2202 RMD160 7a02a2e4e0f7026488071b81638cd5813a7b6cda SHA1 88d6f1880a11118aa8d01b59bb324fa2bda650f7 SHA256 51b16e6ffd93f4e5a79ce4ff11abd59a2b320a30ab0792b74beee992978ffea1
DIST xorg-edit-08.08.06_src.tar.bz2 101654 RMD160 aaddf1572f817c69d282bdefa2cd005cb47b0f06 SHA1 a9ab607121f571ca2d0c18dd9090e41628eb39ac SHA256 93b189c276df9bae9d9bfbb4212a068aad53b524af6615d1dad7003ee5857967
-EBUILD xorg-edit-08.08.06.ebuild 671 RMD160 ce8588a48ad61f79428bdc070a6e581a77505f5d SHA1 6a195500ba8f5364c71866d5b61d882942c2af7e SHA256 08973fe81eb6715b5ba2fafae3b3e934b4f6c74d1855fde1e18a08851c83b204
-MISC ChangeLog 1446 RMD160 6a034596a10cc15c4493cca5b7508c5924ffbc7f SHA1 27969637cefc7babc56309492a84df03d5eab309 SHA256 5f829b6582ba23d4295815bb679c3738254890fb26fa9053e8ed6550a1f2053c
+EBUILD xorg-edit-08.08.06.ebuild 711 RMD160 15b6d28f133d2bb00d3118fe3da55f0a41c5198c SHA1 6748063eb4c9f7b01c65ea42a2eb46e780f19360 SHA256 5977cf65482e2f9817cec48b3ff0ef84ce549fbb4bf2346fc7b523c767040ea0
+MISC ChangeLog 1594 RMD160 45c1d91e7e3d066475f537cdec7eecc4cbc7cd9c SHA1 5f4016b2b67ed717bed62ab442a53559ea4596dc SHA256 6b28057e4a54d21449ae95b269e41eee7b78d0bb0ac7ceeb590fdba581e32d47
MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/x11-misc/xorg-edit/files/xorg-edit-08.08.06-makefile.patch b/x11-misc/xorg-edit/files/xorg-edit-08.08.06-makefile.patch
index 958fd32d3..6fea43b37 100644
--- a/x11-misc/xorg-edit/files/xorg-edit-08.08.06-makefile.patch
+++ b/x11-misc/xorg-edit/files/xorg-edit-08.08.06-makefile.patch
@@ -49,8 +49,8 @@
# implementation
--- Makefile 2008-08-06 20:29:24.000000000 +0200
-+++ Makefile.new 2009-08-16 12:53:07.000000000 +0200
-@@ -8,7 +8,8 @@
++++ Makefile.new 2009-08-16 13:01:36.000000000 +0200
+@@ -8,10 +8,11 @@
# implementation
all:
@@ -58,5 +58,28 @@
+ +make -C libxorgedit
+ +make -C xorgedit
- install:
- cd libxorgedit && make && cd ../xorgedit && make install && cd ..
+-install:
+- cd libxorgedit && make && cd ../xorgedit && make install && cd ..
++install: all
++ +make -C xorgedit install
+
+ clean:
+ cd libxorgedit && make clean && cd ../xorgedit && make clean && cd ..
+--- xorgedit/Makefile 2009-08-16 13:05:03.000000000 +0200
++++ xorgedit/Makefile.new 2009-08-16 13:06:24.000000000 +0200
+@@ -43,10 +43,11 @@
+ rm -f $(OBJECTS) $(OUTPUT)
+
+ install: all
+- mkdir -p $(INSTALLPATH)/lib/xorgedit/
+- cp -r ../options $(INSTALLPATH)/lib/xorgedit/
+- cp -r ../de_DE $(INSTALLPATH)/lib/xorgedit/
+- cp $(OUTPUT) $(INSTALLPATH)/lib/xorgedit/
++ mkdir -p $(INSTALLPATH)/xorgedit/
++ cp -r ../options $(INSTALLPATH)/xorgedit/
++ cp -r ../de_DE $(INSTALLPATH)/xorgedit/
++ mkdir -p $(INSTALLPATH)/../bin
++ cp $(OUTPUT) $(INSTALLPATH)/../bin/
+
+ uninstall:
+ rm -rf $(INSTALLPATH)/lib/xorgedit/
diff --git a/x11-misc/xorg-edit/xorg-edit-08.08.06.ebuild b/x11-misc/xorg-edit/xorg-edit-08.08.06.ebuild
index 228ace9af..1119e2294 100644
--- a/x11-misc/xorg-edit/xorg-edit-08.08.06.ebuild
+++ b/x11-misc/xorg-edit/xorg-edit-08.08.06.ebuild
@@ -4,7 +4,7 @@
WX_GTK_VER="2.8"
-inherit base toolchain-funcs wxwidgets
+inherit base multilib toolchain-funcs wxwidgets
DESCRIPTION="GUI to edit XServer-file xorg.conf easily"
HOMEPAGE="http://www.deesaster.org/progxorg.php"
@@ -27,6 +27,6 @@ src_compile() {
}
src_install() {
- dobin xorg-edit || die "failed to install ${PN}"
+ emake INSTALLPATH="${D}"/usr/$(get_libdir) install || die "Installation failed"
dodoc CHANGELOG README || die "nothing to read"
}