Update to EAPI 3 and fix several repoman issues.

I believe the remaining repoman issues are due to:

* some dependency packages in overlays (vs. the main Portage tree)
* some packages only supporting version controlled source (makes it
  hard to depend on a specific version)

Neither one of these will cause me to loose sleep ;).

diff --git a/app-misc/lifelines/ChangeLog b/app-misc/lifelines/ChangeLog
index 512d850405230115ac74ad94560be439f9b1aa66..c213127bd861142eb4f7b0c6191d99a131bb978c 100644 (file)
--- a/app-misc/lifelines/ChangeLog
+++ b/app-misc/lifelines/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*lifelines-3.0.62.0 (31 Dec 2010)
+  31 Dec 2010; W. Trevor King <wking@drexel.edu> lifelines-3.0.62.0.ebuild, -lifelines-3.0.37.2.ebuild :
+  - Fix repoman-reported issues with 3.0.62.0.
+  - Remove outdated 3.0.37.2.
+
 *lifelines-3.0.62.0 (12 Apr 2009)
   12 Apr 2009; W. Trevor King <wking@drexel.edu> lifelines-3.0.62.0.ebuild :
   New upstream package.  Also added initial ChangeLog which should be

diff --git a/app-misc/lifelines/Manifest b/app-misc/lifelines/Manifest
index 26b230c7be9c74f70e690610da789489fe2ccb3f..a67177c115a7de07a1963c982cd4ca5aa9dce2af 100644 (file)
--- a/app-misc/lifelines/Manifest
+++ b/app-misc/lifelines/Manifest
@@ -1,6 +1,4 @@
-DIST lifelines-3.0.37.2.tar.bz2 10162 RMD160 6e70711ef5fefac24ba913ec47855a68249e145c SHA1 f907740b653da507d3de69fb76e5effc7ce0d67a SHA256 a7e9bf9931e1f9bcf2c4b9163c63d486a0da2b50d816056256d1d870baa206fd
 DIST lifelines-3.0.62.tar.bz2 2289866 RMD160 5335b6d5a9c8300ee8a9bbdc41c66a8632a439df SHA1 1d402e42cb0e4386367afa98c2cb04a3dbc28a26 SHA256 1c279958748e0f80b399bd8ea29f4030aa6db93059785d68abccf98b59c41e05
-EBUILD lifelines-3.0.37.2.ebuild 1601 RMD160 1140ae60114b8fa0cd7f9bee11368180ece6d2d3 SHA1 ce15572b3fb3d1088038fe010a5099c723c26d13 SHA256 5c8274c77539d968a8bd77a493b983f0bfa9e2396e4e8fbeaf6e566f9f99e429
-EBUILD lifelines-3.0.62.ebuild 1601 RMD160 7a541811e0163482216554b168cf40dcffe511c3 SHA1 d64cf856401167fcfc8880e4361482269d485cbf SHA256 5c9128be67f09adbe8fcbeeccf7106abcec2ae89559e57e231ff828f9d5dc683
-MISC ChangeLog 1558 RMD160 8e99f37397f88b6df6c5c0a388edefe2cffc051b SHA1 8408fbe0f96a4c4160ac7c3482281c680e11b629 SHA256 abc65a6b664d13c40fbcabe64903a2f9a5f4a6c1b824834d3cc63e8ccc5d05dc
+EBUILD lifelines-3.0.62.ebuild 1544 RMD160 4896f07869bd639b7a39ac38870a3caa875ecfd9 SHA1 02fb06847df281a944376a9ded16bea2fe898cf3 SHA256 d977babf3ecfae941d04fdbea110c4e2b295cf9b60feba9a8b2828b38c83f129
+MISC ChangeLog 1775 RMD160 85ac9d1d8bf44842751455fa0afe2965b443a94c SHA1 7e24bfcc1517cf6137323229cab3703e510e348d SHA256 bf85f11668da0b28708a6423298742b376fa8fef2e5db75b421cf49b2f64608d
 MISC metadata.xml 419 RMD160 f7dac0bed6d1f352c05cb03788c9ae236b88f914 SHA1 ce8a25646d3ecff0b0b3ae71ec58d0b364aec5f6 SHA256 fe9dca99fc4c9d248ebb7495f874adae2e6562a00fba094c9acfae8ebe893381

diff --git a/app-misc/lifelines/lifelines-3.0.37.2.ebuild b/app-misc/lifelines/lifelines-3.0.37.2.ebuild
deleted file mode 100644 (file)
index f4e3394..0000000
--- a/app-misc/lifelines/lifelines-3.0.37.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header$
-
-DESCRIPTION="Lifelines is an open source genealogy program."
-HOMEPAGE="${PN}.sf.net"
-SRC_URI="mirror://sourceforge//${PN}/${P}.tar.bz2"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86"
-DEPEND="virtual/glibc
-               nls? sys-devel/gettext
-               doc? app-text/docbook-sgml-utils"
-IUSE="doc nls"
-
-src_compile() {
-       # So that "make install" does not try to install documentation in
-       # /usr/share/doc/lifelines.
-       sed -ie 's/SUBDIRS = build intl po win32 src docs reports tt/SUBDIRS = build intl po src reports tt/' Makefile.in
-       local myconf
-       use nls || myconf='--disable-nls'
-       econf ${myconf} || die
-       emake || die
-       cd docs
-       # If app-text/docbook-sgml-utils is installed, documents are built from
-       # source using the jw tools.
-       emake || die
-}
-
-src_install() {
-       make install DESTDIR=${D} || die
-       dodoc AUTHORS ChangeLog NEWS README README.DEVELOPERS README.INTERNATIONAL
-       doman docs/{btedit.1,dbverify.1,llines.1}
-       insinto /usr/share/doc/${P}/manuals
-       # The PDF docs are not installed, since they are corrupted.
-       use doc && doins docs/*.jpg docs/*.html docs/*.txt
-       # Adds the graphics for the reports HTML index, and a config file example.
-       insinto /usr/share/${PN}
-       doins reports/boc.gif reports/ll.png
-       newins .linesrc linesrc.example
-       # Installs the reports.
-       insinto /usr/share/${PN}/reports/
-       doins reports/*.ll reports/*.tex reports/CREDIT reports/README
-       insinto /usr/share/${PN}/reports/st
-       doins reports/st/*.ll
-       # Installs the env file.
-       insinto /etc/env.d
-       doins ${FILESDIR}/25lifelines
-}

diff --git a/app-misc/lifelines/lifelines-3.0.62.ebuild b/app-misc/lifelines/lifelines-3.0.62.ebuild
index 1a6ade10a435b8fbca7b8dba9007bba3c9bd127d..12f80f4a922801ccfb522373efef82c189b3298c 100644 (file)
--- a/app-misc/lifelines/lifelines-3.0.62.ebuild
+++ b/app-misc/lifelines/lifelines-3.0.62.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="3"
 DESCRIPTION="Lifelines is an open source genealogy program."
 HOMEPAGE="${PN}.sf.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
@@ -11,15 +12,17 @@ KEYWORDS="~x86"
 DEPEND="sys-libs/glibc
        nls? ( sys-devel/gettext )
        doc? ( app-text/docbook-sgml-utils )"
+RDEPEND=""
 IUSE="doc nls"
 
-src_compile() {
+src_configure() {
        # So that "make install" does not try to install documentation in
        # /usr/share/doc/lifelines.
-       sed -ie 's/SUBDIRS = build intl po win32 src docs reports tt/SUBDIRS = build intl po src reports tt/' Makefile.in
-       local myconf
-       use nls || myconf='--disable-nls'
-       econf ${myconf} || die
+       sed -ie 's/SUBDIRS = build intl po win32 src docs reports tt/SUBDIRS = build intl po src reports tt/' Makefile.in || die
+       econf $(use_enable nls) || die
+}
+
+src_compile() {
        emake || die
        cd docs
        # If app-text/docbook-sgml-utils is installed, documents are built from
@@ -28,22 +31,19 @@ src_compile() {
 }
 
 src_install() {
-       make install DESTDIR=${D} || die
-       dodoc AUTHORS ChangeLog NEWS README README.DEVELOPERS README.INTERNATIONAL
-       doman docs/{btedit.1,dbverify.1,llines.1}
+       make install DESTDIR="${D}" || die
+       dodoc AUTHORS ChangeLog NEWS README* || die
+       doman docs/{btedit.1,dbverify.1,llines.1} || die
        insinto /usr/share/doc/${P}/manuals
        # The PDF docs are not installed, since they are corrupted.
-       use doc && doins docs/*.jpg docs/*.html docs/*.txt
+       use doc && doins docs/*.jpg docs/*.html docs/*.txt || die
        # Adds the graphics for the reports HTML index, and a config file example.
        insinto /usr/share/${PN}
-       doins reports/boc.gif reports/ll.png
-       newins .linesrc linesrc.example
+       doins reports/boc.gif reports/ll.png || die
+       newins .linesrc linesrc.example || die
        # Installs the reports.
        insinto /usr/share/${PN}/reports/
-       doins reports/*.ll reports/*.tex reports/CREDIT reports/README
+       doins reports/*.ll reports/*.tex reports/CREDIT reports/README || die
        insinto /usr/share/${PN}/reports/st
-       doins reports/st/*.ll
-       # Installs the env file.
-       insinto /etc/env.d
-       doins ${FILESDIR}/25lifelines
+       doins reports/st/*.ll || die
 }