5 files changed, 70 insertions, 47 deletions
diff --git a/x11-misc/xorg-edit/ChangeLog b/x11-misc/xorg-edit/ChangeLog
index 2d7bbb51d..a7882cb7b 100644
--- a/x11-misc/xorg-edit/ChangeLog
+++ b/x11-misc/xorg-edit/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for x11-misc/xorg-edit
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*xorg-edit-08.08.06 (15 Aug 2009)
+
+  15 Aug 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  -xorg-edit-07.06.15.ebuild, -files/xorg-edit-07.06.15-makefile.patch,
+  +xorg-edit-08.08.06.ebuild, +files/xorg-edit-08.08.06-makefile.patch:
+  version bump
+
   13 Jan 2008; Jakub Moc <jakub@gentoo.org> xorg-edit-07.06.15.ebuild:
   Fix wxGTK handling
 
diff --git a/x11-misc/xorg-edit/Manifest b/x11-misc/xorg-edit/Manifest
index 8a622030f..edd1da160 100644
--- a/x11-misc/xorg-edit/Manifest
+++ b/x11-misc/xorg-edit/Manifest
@@ -1,5 +1,5 @@
-AUX xorg-edit-07.06.15-makefile.patch 646 RMD160 9943d4f2d73cf2f3b0830486689ada35a04e82d1 SHA1 43e520060b7b85bb7ecb1b69a3a56f3306901f76 SHA256 9af79161bd68fc407ce293541d833aa8f8f46f6937a510f9154cdd187f127680
-DIST xorg-edit_07.06.15_src.tar.bz2 95905 RMD160 b84bd2d3bb9c498035e5a493919500eedc4e4d4f SHA1 60f543c4da5e6d5c97b697f0086ec5265a6bb73f SHA256 87f09e73416550a4cb33d456f0da3fd83f5d20ba67b55fa457bf1ffcf1641d46
-EBUILD xorg-edit-07.06.15.ebuild 690 RMD160 03f11495efd41523b42cfe0fc8e6b073b112d553 SHA1 135efe759a2904b3707c51637925690886abd30c SHA256 fa180549acd590e0852c52eba8e832e8e06f7c379678c0641247be4b515a820c
-MISC ChangeLog 1065 RMD160 3bc9976858979a136d75c6a0bb52235e0986ecb8 SHA1 23f7448b631487dd147f571f6424927d248b4999 SHA256 7cdc8f52ebacea3c321d11d615c53af3bc439fdf246418bfac085088d9b9a0d0
+AUX xorg-edit-08.08.06-makefile.patch 1083 RMD160 1a7248b05c8d335e34d5d17d3e1cdfe9aed0aff4 SHA1 066eb2170480c4fd9c190e33efbdb2d576a6a1a6 SHA256 d7b142d42eba9bdda3607adde44e9015380df29f659f66bab148a07e16d285a1
+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 1317 RMD160 4e4cbd85e982e248e97815910b6d5cc685371c69 SHA1 b61697b48b24baf7f46c5273bce19658c46e3f77 SHA256 a874e397d11f9a1fc59dea97d228f8d1a9852d24108d63718854e1194744444a
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/x11-misc/xorg-edit/files/xorg-edit-07.06.15-makefile.patch b/x11-misc/xorg-edit/files/xorg-edit-07.06.15-makefile.patch
deleted file mode 100644
index f539524da..000000000
--- a/x11-misc/xorg-edit/files/xorg-edit-07.06.15-makefile.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- xorg-edit/xorgedit/Makefile.orig	2007-07-06 20:21:51.000000000 -0400
-+++ xorg-edit/xorgedit/Makefile	2007-07-06 20:44:32.000000000 -0400
-@@ -17,21 +17,21 @@
- INCLUDES = -I../
- 
- # C++ compiler flags (-g -O2 -Wall)
--CXXFLAGS = `wx-config --cxxflags`
-+CXXFLAGS += `wx-config --cxxflags`
- 
- # compiler
--CXX = `wx-config --cxx`
-+CXX ?= `wx-config --cxx`
- 
- # library paths
- LIBS = -L../ -lm -lxorgedit
- 
- # compile flags
--LDFLAGS = `wx-config --libs`
-+LDFLAGS += `wx-config --libs`
- 
- # implementation
- 
- all: $(OUTPUT)
--	rm -f $(OBJECTS) $(OUTPUT) 
-+	rm -f $(OBJECTS)
- 
- $(OUTPUT): $(OBJECTS)
- 	$(CXX) -o $(OUTPUT) $(OBJECTS) $(LIBS) $(LDFLAGS)
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
new file mode 100644
index 000000000..a8d1fa908
--- /dev/null
+++ b/x11-misc/xorg-edit/files/xorg-edit-08.08.06-makefile.patch
@@ -0,0 +1,46 @@
+--- libxorgedit/Makefile	2008-08-05 18:46:23.000000000 +0200
++++ libxorgedit/Makefile.new	2009-08-15 17:52:26.000000000 +0200
+@@ -6,10 +6,10 @@
+ OUTPUT = ../libxorgedit.a
+ 
+ # compiler
+-CXX = g++
++CXX ?= g++
+ 
+ # C++ compiler flags (-g -O2 -Wall)
+-CXXFLAGS = -Wall -Wextra -O3
++#CXXFLAGS = -Wall -Wextra -O3
+ 
+ # implementation
+ 
+--- xorgedit/Makefile	2008-08-06 20:29:54.000000000 +0200
++++ xorgedit/Makefile.new	2009-08-15 20:11:11.000000000 +0200
+@@ -18,23 +18,23 @@
+ INCLUDES = -I../
+ 
+ # C++ compiler flags (-g -O2 -Wall)
+-CXXFLAGS = `wx-config --cxxflags` -O3
++CXXFLAGS += `wx-config --cxxflags`
+ 
+ # compiler
+-CXX = `wx-config --cxx`
++CXX ?= `wx-config --cxx`
+ 
+ # library paths
+-LIBS = -L../ -lm -lxorgedit
++LIBS = -L../ -lm -lxorgedit `wx-config --libs`
+ 
+ # compile flags
+-LDFLAGS = `wx-config --libs`
++#LDFLAGS = `wx-config --libs`
+ 
+ # implementation
+ 
+ all: $(OUTPUT)
+ 
+ $(OUTPUT): $(OBJECTS)
+-	$(CXX) -o $(OUTPUT) $(OBJECTS) $(LIBS) $(LDFLAGS)
++	$(CXX) $(LDFLAGS) -o $(OUTPUT) $(OBJECTS) $(LIBS)
+ 
+ $(OBJECTS): $(SOURCES)
+ 	$(CXX) $(INCLUDES) -c $(SOURCES) $(CXXFLAGS)
diff --git a/x11-misc/xorg-edit/xorg-edit-07.06.15.ebuild b/x11-misc/xorg-edit/xorg-edit-08.08.06.ebuild
index a09d9386b..228ace9af 100644
--- a/x11-misc/xorg-edit/xorg-edit-07.06.15.ebuild
+++ b/x11-misc/xorg-edit/xorg-edit-08.08.06.ebuild
@@ -2,33 +2,31 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-WX_GTK_VER="2.6"
-inherit eutils toolchain-funcs wxwidgets
+WX_GTK_VER="2.8"
+
+inherit base toolchain-funcs wxwidgets
 
 DESCRIPTION="GUI to edit XServer-file xorg.conf easily"
 HOMEPAGE="http://www.deesaster.org/progxorg.php"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}_src.tar.bz2"
 
-LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="=x11-libs/wxGTK-2.6*
-	x11-base/xorg-server"
+DEPEND="x11-libs/wxGTK"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-makefile.patch"
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+)
 
 src_compile() {
 	emake CXX=$(tc-getCXX) || die "emake failed"
 }
 
 src_install() {
-	dobin xorg-edit
-	dodoc CHANGELOG README
+	dobin xorg-edit || die "failed to install ${PN}"
+	dodoc CHANGELOG README || die "nothing to read"
 }