summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-editors/x2')
-rw-r--r--app-editors/x2/ChangeLog4
-rw-r--r--app-editors/x2/Manifest10
-rw-r--r--app-editors/x2/files/x2-1.1.0-Makefile.patch19
-rw-r--r--app-editors/x2/files/x2-1.1.0-desktop.patch18
-rw-r--r--app-editors/x2/metadata.xml3
-rw-r--r--app-editors/x2/x2-1.1.0.ebuild13
6 files changed, 60 insertions, 7 deletions
diff --git a/app-editors/x2/ChangeLog b/app-editors/x2/ChangeLog
index e316c3fef..7a0fc0739 100644
--- a/app-editors/x2/ChangeLog
+++ b/app-editors/x2/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 09 Sep 2012; Manuel Rüger (mrueg) gentoo@rueg.eu x2-1.1.0.ebuild,
+ +files/x2-1.1.0-Makefile.patch, +files/x2-1.1.0-desktop.patch, metadata.xml:
+ Respect CC, use pkg-config, fix desktop file. Thanks to floppym
+
*x2-1.1.0 (04 May 2012)
04 May 2012; Manuel Rüger (mrueg) gentoo@rueg.eu +x2-1.1.0.ebuild,
diff --git a/app-editors/x2/Manifest b/app-editors/x2/Manifest
index cadf2d1c9..6df1da579 100644
--- a/app-editors/x2/Manifest
+++ b/app-editors/x2/Manifest
@@ -1,4 +1,6 @@
-DIST 145463-x2-1.1.0.tar.gz 72708 RMD160 2a94cad0a3afb74ea3ea599df592c7d153c344cb SHA1 a2643fdfe44e7c7b0f77c9dcc950286ab6b9ea67 SHA256 6b231e64996df04f64d0a51b595c753e07e38fd4cc8b3a043abad0e773d67b4a
-EBUILD x2-1.1.0.ebuild 450 RMD160 acd3982b4e94d27625177812dc207fc6b640c300 SHA1 97cdb469e439e7eaa9585a126de465f6c3dad9ee SHA256 5ebd0cfb47dca469a2b1960b9363099fe7ac9c5db04b5bd0d5e20d8b90703667
-MISC ChangeLog 288 RMD160 1312cdf84e74d3e49311538c25a92c960f43f7a4 SHA1 5a4b1e13eb8d1ef4a4e66bb965d046dbc95a115c SHA256 748b265d5d22d928ee7d5705f885c37bbdaf3f8d30320ddef1f701675bfe4515
-MISC metadata.xml 214 RMD160 efd8175069efb91061298ff4584218b633e44678 SHA1 d372fdbfcb7fd07a4082961d3f3527be4fca1d60 SHA256 c1f09dc7d5313cd2da7b82259c7846ed23144d62b15e59680ada90e2b6b4d154
+AUX x2-1.1.0-Makefile.patch 494 SHA256 b9d2cd896eda387885f7f543f086a94c5dcf2a44076cb12cc3226b19b261cde8 SHA512 a4b7371c4f3673783776e093672612b7d5c226c8e02b5fdba3bf7eca0967e627c603917a0f9d8ccf0bb7b091d92899a3bcdd75fbc4c1817dc36ada501e3db566 WHIRLPOOL c0aeaca60b43663e5f8f5db28c53d839c6c380f52bc29a39d9f769b5026c1ffead852698b8c9a8ca67629c20571472b73618bcc94ebcdceb016ea2aabeef88d6
+AUX x2-1.1.0-desktop.patch 453 SHA256 1d5e6480a2ca413d0bb7c240fd700005e9e69526ad5f24b4211be504d0a80091 SHA512 c58de6067d5875101116ed8b10a6e943d49f458feb5ce0ba0c3886d11d87e7e1e14180dda144498e05506ac1658d59bb76c80f12eaccc5a3308849c07c6e7976 WHIRLPOOL c23a367207844a35c1cca174493f8dfcf25d622acead0accffa90565c937bc6d06101088ae76dce45915265f6ea75fb20d61bcce2589c37ffca5e24961c8b9a5
+DIST 145463-x2-1.1.0.tar.gz 72708 SHA256 6b231e64996df04f64d0a51b595c753e07e38fd4cc8b3a043abad0e773d67b4a SHA512 7a601e222062d0ff381cb09854f07798789d5e1a4e95b4029037965aca6e4a68f171906bcf307889a91e45906f577443d224908a53f2d9b026c92703dea06561 WHIRLPOOL f6d03ba5248e348d252a1abb8ce3cecffadf9158817cb18af0400e3440080682e7eb27cbacba7cc12f8884832b24521af533441ab55f520e6a31f027e87934c0
+EBUILD x2-1.1.0.ebuild 616 SHA256 00c139e1dbafb5171b41b851f4308e96d0ff74903d8b15c59163dece83867681 SHA512 67a331475ba1b6d1e0cc5a7d6704edba71df787b9b3d0204dd657449aada75bae2162402e5546052d2e36f6b42c8037d1e6eb5563ef6fbce59ba7bc4bea3a27f WHIRLPOOL cc06852dc85a9c31bc3de0eaf26b9fdc21c2d3d6068bd0e2b69b196f85214541f7c725cb35800d63a91ed6a4278524f05e93dd3b88757cbc83a9e712b0e0cd92
+MISC ChangeLog 503 SHA256 716c77d46e0bae992acbd15dcc75cfaf9015c587b66e58250de8f4559b0816d4 SHA512 3e9b4506e0c5ec6d01ad8a7ad9bbab3ea162c7d0f15e94603efb437eb7ab9a4b8ea55cec1d69b7e743ac0221dc6f1c5309c4c130e290366305402546c95c1889 WHIRLPOOL 9c32d9161e0d1e1c9329abce5ba29a41c2f4adb0ee4795cae2274a491dc8998dafa592766a61375c332a85eaa0166cb81f4dc8e09dbbe491dca8dc8187312782
+MISC metadata.xml 237 SHA256 7aebf1a287d9d2d4fa5b66af4c801da2083b6bc7d3cd077c235869ade1fb960d SHA512 e9249ef4ab11f8463a54b559634717a35dcd23da7e4d233feb223f3db7847e0638a5a3c89fb23a05c567251dde2e796c2ce3cd1efd57ff1a513c6fe55f9978a8 WHIRLPOOL 01e3ce0b931af3ce0389559235d360f5278067cb93376de4bf06a4e640fe54619595ebde1b8c811b64cb2a3aeab2b61ed54052f6e33de9470342c4cd27ddd443
diff --git a/app-editors/x2/files/x2-1.1.0-Makefile.patch b/app-editors/x2/files/x2-1.1.0-Makefile.patch
new file mode 100644
index 000000000..4a996a635
--- /dev/null
+++ b/app-editors/x2/files/x2-1.1.0-Makefile.patch
@@ -0,0 +1,19 @@
+--- src/Makefile.in.old 2012-08-21 22:54:34.910711588 +0200
++++ src/Makefile.in 2012-08-21 22:55:54.767708115 +0200
+@@ -30,10 +30,14 @@
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+
++CFLAGS +=$(shell pkg-config --cflags vte gtksourceview-2.0)
++LIBS +=$(shell pkg-config --libs vte gtksourceview-2.0)
++
++
+ all: x2
+
+ x2: main.c
+- gcc -Wall -g -O0 -o $@ $+ `pkg-config --libs --cflags vte gtksourceview-2.0`
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ $(LIBS)
+ clean:
+ -rm x2 &>/dev/null
+
+
diff --git a/app-editors/x2/files/x2-1.1.0-desktop.patch b/app-editors/x2/files/x2-1.1.0-desktop.patch
new file mode 100644
index 000000000..2f9cfed1b
--- /dev/null
+++ b/app-editors/x2/files/x2-1.1.0-desktop.patch
@@ -0,0 +1,18 @@
+--- data/x2.desktop.old 2012-08-19 23:22:18.982183528 +0200
++++ data/x2.desktop 2012-08-19 23:24:26.628185215 +0200
+@@ -1,6 +1,5 @@
+
+ [Desktop Entry]
+-Version=1.0.4
+ Name=X2
+ Comment=Simple text editor
+ Comment[bg]=Опростен текстов редактор
+@@ -45,7 +45,6 @@
+ Icon=accessories-text-editor
+ Terminal=false
+ Type=Application
+-MimeType=text/plain
++MimeType=text/plain;
+ Categories=GTK;Utility;TextEditor;
+ StartupNotify=true
+-Path=
diff --git a/app-editors/x2/metadata.xml b/app-editors/x2/metadata.xml
index cc3fe2494..61c2e80c4 100644
--- a/app-editors/x2/metadata.xml
+++ b/app-editors/x2/metadata.xml
@@ -2,6 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
- <email>maintainer-wanted@gentoo.org</email>
+ <email>gentoo@rueg.eu</email>
+ <name>Manuel Rüger (mrueg)</name>
</maintainer>
</pkgmetadata>
diff --git a/app-editors/x2/x2-1.1.0.ebuild b/app-editors/x2/x2-1.1.0.ebuild
index 742942df5..451009d89 100644
--- a/app-editors/x2/x2-1.1.0.ebuild
+++ b/app-editors/x2/x2-1.1.0.ebuild
@@ -4,7 +4,9 @@
EAPI=4
-DESCRIPTION="a micro-ide/text editor written in C/GTK+"
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A micro-ide/text editor written in C/GTK+"
HOMEPAGE="http://gnomefiles.org/content/show.php/X2?content=145463"
SRC_URI="http://gnomefiles.org/CONTENT/content-files/145463-${P}.tar.gz"
@@ -15,4 +17,11 @@ IUSE=""
RDEPEND="x11-libs/gtksourceview:2.0
x11-libs/vte:0"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare(){
+ epatch "${FILESDIR}/${P}-desktop.patch"
+ epatch "${FILESDIR}/${P}-Makefile.patch"
+ tc-export CC
+}