media-video/divxcalc: Fix broken build system. Update homepage to one from freshmeat (axljab.homelinux.org is gone). Tested on amd64.

svn path=/sunrise/; revision=6124

4 files changed, 71 insertions, 8 deletions

diff --git a/media-video/divxcalc/ChangeLog b/media-video/divxcalc/ChangeLog
index b581605d8..44a1e96d9 100644
--- a/media-video/divxcalc/ChangeLog
+++ b/media-video/divxcalc/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for media-video/divxcalc
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Apr 2008; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
+  divxcalc-0.6.ebuild, +files/divxcalc-0.6-build.patch:
+  Fix broken build system. Update homepage to one from freshmeat
+  (axljab.homelinux.org is gone). Tested on amd64.
+
   20 Sep 2006; Raul Porcel (armin76) <armin76@gmail.com>
   +divxcalc-0.6.ebuild, +metadata.xml:
   New ebuild: media-video/divxcalc for bug 98928
diff --git a/media-video/divxcalc/Manifest b/media-video/divxcalc/Manifest
index 843a5d6b6..0430bf315 100644
--- a/media-video/divxcalc/Manifest
+++ b/media-video/divxcalc/Manifest
@@ -1,4 +1,5 @@
+AUX divxcalc-0.6-build.patch 1519 RMD160 1331d884a938eaa72033fb26defdee332589ee3f SHA1 9d3b5c0a7a6f5da68f7eada605f524e9671ad131 SHA256 f956787672ce755097bf18fd2f952ddbe39a6b060070679006710c5d91269b3b
 DIST divxcalc-0.6.tar.bz2 204741 RMD160 28644e64475ab068767f16a7ec52e9b3f8fd3b3d SHA1 9cd58b49ad538c0b583c99200c0d98f84647f58a SHA256 5c1e8389fff6cba269933947e21ea8175308cffdf6e5326dee31626df6b0503a
-EBUILD divxcalc-0.6.ebuild 668 RMD160 1e0de8875c69961b9c9d3254d700951e70dcd314 SHA1 01419acc357b33858236e748dfc5ba62fb12b9d2 SHA256 9d0513d1e774e346ab4d427dac71142f9a2f02b3bcfe6c6f41e74e5051c8e3d8
-MISC ChangeLog 267 RMD160 a6ff20998e174d41ffdeb40962de84e3ef826791 SHA1 895eecb4ee92efc3b7d8da4579bbfb378f233ee4 SHA256 dbbe3de85cc30e4c5958b7dd213f99b52e65c017a16c3350a82e4a30019faaf6
+EBUILD divxcalc-0.6.ebuild 866 RMD160 ff3718be93f41c979f124bb41f64ac4cf7383654 SHA1 8ca97f86903e811c9f6314b53eaf9b2eb09ba5fe SHA256 716455ccfef1fa7fd185111170507c2b6b4a9e5eebb221562db1d08136fcb018
+MISC ChangeLog 510 RMD160 1d38dd3b65f0a3f8a32d5164a13be53694f84a04 SHA1 a9ac4bdfb55d7d98f284280ca902775b3727ea8b SHA256 1bbf2d07c1971bbcc2e3af6598a325aa295460466545223c3653dd5fc68136d3
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/media-video/divxcalc/divxcalc-0.6.ebuild b/media-video/divxcalc/divxcalc-0.6.ebuild
index 463f69235..e958b87fb 100644
--- a/media-video/divxcalc/divxcalc-0.6.ebuild
+++ b/media-video/divxcalc/divxcalc-0.6.ebuild
@@ -2,26 +2,36 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit autotools eutils
+
 DESCRIPTION="A simple MPEG-4 bitrate calculator used when ripping a DVD to achieve the ideal filesize."
-HOMEPAGE="http://axljab.homelinux.org/DivXcalc"
-SRC_URI="http://www.imagef1.net.nz/${PN}/${P}.tar.bz2
+HOMEPAGE="http://axllent.org/projects/divxcalc/files/"
+SRC_URI="http://axllent.org/projects/${PN}/files/${P}.tar.bz2
+	http://www.imagef1.net.nz/${PN}/${P}.tar.bz2
 	http://mirror.dannz.net/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="=x11-libs/qt-3*"
 DEPEND="${RDEPEND}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-build.patch"
+	cp admin/acinclude.m4.in acinclude.m4
+	eautoreconf
+}
+
 src_compile() {
-	emake -f Makefile.dist
 	econf || die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc NEWS README
+	dodoc README
 }
diff --git a/media-video/divxcalc/files/divxcalc-0.6-build.patch b/media-video/divxcalc/files/divxcalc-0.6-build.patch
new file mode 100644
index 000000000..8b4bcb4fc
--- /dev/null
+++ b/media-video/divxcalc/files/divxcalc-0.6-build.patch
@@ -0,0 +1,47 @@
+Only in divxcalc-0.6/admin: .acinclude.m4.in.swp
+diff -ru divxcalc-0.6.orig/configure.in divxcalc-0.6/configure.in
+--- divxcalc-0.6.orig/configure.in	2003-05-25 09:51:54.000000000 -0400
++++ divxcalc-0.6/configure.in	2008-04-29 07:36:46.843509972 -0400
+@@ -5,7 +5,7 @@
+ AC_CONFIG_AUX_DIR(admin)
+ AC_CANONICAL_SYSTEM 
+ 
+-VERSION="0.5"
++VERSION="0.6"
+ RELEASE="1"
+ LARGEFILESUPPORT="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
+ 
+@@ -40,7 +40,6 @@
+ [ LINK_STATIC="-static" ],
+ )
+ 
+-AC_CHECK_COMPILERS
+ AC_ENABLE_SHARED(yes)
+ AC_ENABLE_STATIC(no)
+ dnl KDE_PROG_LIBTOOL
+diff -ru divxcalc-0.6.orig/src/Makefile.am divxcalc-0.6/src/Makefile.am
+--- divxcalc-0.6.orig/src/Makefile.am	2003-05-25 09:51:54.000000000 -0400
++++ divxcalc-0.6/src/Makefile.am	2008-04-29 09:04:29.844509876 -0400
+@@ -17,6 +17,22 @@
+ 
+ ####### kdevelop will overwrite this part!!! (end)############
+ 
++BUILT_SOURCES = dialogdivxcalcapp.h
++nodist_divxcalc_SOURCES = dialogdivxcalcapp.cpp dialogdivxcalcapp.moc.cpp cdivxcalcapp.moc.cpp
++CLEANFILES = dialogdivxcalcapp.h dialogdivxcalcapp.cpp dialogdivxcalcapp.moc.cpp cdivxcalcapp.moc.cpp
++
++dialogdivxcalcapp.h:
++	$(UIC) dialogdivxcalcapp.ui -o $@
++
++dialogdivxcalcapp.cpp: dialogdivxcalcapp.h dialogdivxcalcapp.ui
++	$(UIC) -impl dialogdivxcalcapp.h dialogdivxcalcapp.ui -o $@
++
++dialogdivxcalcapp.moc.cpp: dialogdivxcalcapp.h
++	$(MOC) dialogdivxcalcapp.h -o $@
++
++cdivxcalcapp.moc.cpp: cdivxcalcapp.h
++	$(MOC) cdivxcalcapp.h -o $@
++
+ # set the include path for X, qt and KDE
+ INCLUDES= $(all_includes)
+