drop old, bump new, add Lukas Dzunko as maintainer, bug 528192

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)

4 files changed, 37 insertions, 35 deletions

diff --git a/app-misc/email2trac/ChangeLog b/app-misc/email2trac/ChangeLog
index 293423b3eb89..8385beae3728 100644
--- a/app-misc/email2trac/ChangeLog
+++ b/app-misc/email2trac/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/email2trac
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/email2trac/ChangeLog,v 1.14 2012/10/01 22:55:38 radhermit Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/email2trac/ChangeLog,v 1.15 2015/01/12 21:52:41 dlan Exp $
+
+*email2trac-2.8.4 (12 Jan 2015)
+*email2trac-2.6.2-r1 (12 Jan 2015)
+
+  12 Jan 2015; Yixun Lan <dlan@gentoo.org> -email2trac-2.6.0.ebuild,
+  -email2trac-2.6.2.ebuild, +email2trac-2.6.2-r1.ebuild,
+  +email2trac-2.8.4.ebuild, metadata.xml:
+  drop old, bump new, add Lukas Dzunko as maintainer, bug 528192 
 
   01 Oct 2012; Tim Harder <radhermit@gentoo.org> -email2trac-2.4.7.ebuild,
   -email2trac-2.5.0.ebuild:
diff --git a/app-misc/email2trac/email2trac-2.6.0.ebuild b/app-misc/email2trac/email2trac-2.6.2-r1.ebuild
index 43853cb9e81b..f1175ec54165 100644
--- a/app-misc/email2trac/email2trac-2.6.0.ebuild
+++ b/app-misc/email2trac/email2trac-2.6.2-r1.ebuild
@@ -1,35 +1,35 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/email2trac/email2trac-2.6.0.ebuild,v 1.1 2012/09/01 00:41:44 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/email2trac/email2trac-2.6.2-r1.ebuild,v 1.1 2015/01/12 21:52:41 dlan Exp $
 
-EAPI="4"
-PYTHON_DEPEND="2"
+EAPI="5"
 
-inherit python
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
 
-DESCRIPTION="Utilites to convert emails into trac objects"
-HOMEPAGE="https://subtrac.sara.nl/oss/email2trac/"
+DESCRIPTION="Utilities to convert emails to trac tickets"
+HOMEPAGE="https://oss.trac.surfsara.nl/email2trac"
 SRC_URI="ftp://ftp.sara.nl/pub/outgoing/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
 
-RDEPEND="=www-apps/trac-0.12*"
+RDEPEND="${PYTHON_DEPS}
+		<www-apps/trac-1.1[${PYTHON_USEDEP}]"
 
 pkg_setup() {
 	einfo "You can set the following variables in make.conf:"
 	einfo " - EMAIL2TRAC_TRAC_USER (default: apache)"
 	einfo " - EMAIL2TRAC_MTA_USER (default: nobody)"
 
-	python_pkg_setup
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {
 	sed -i -e "/^CFLAGS/s:=:&${CFLAGS} :" \
 		-e "s:\$(CC):& ${LDFLAGS} :" \
-		Makefile.in
+		Makefile.in || die 'sed failed'
 }
 
 src_configure() {
@@ -37,9 +37,3 @@ src_configure() {
 		--with-trac_user=${EMAIL2TRAC_TRAC_USER:-apache} \
 		--with-mta_user=${EMAIL2TRAC_MTA_USER:-nobody}
 }
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README
-	python_convert_shebangs -r 2 "${D}"
-}
diff --git a/app-misc/email2trac/email2trac-2.6.2.ebuild b/app-misc/email2trac/email2trac-2.8.4.ebuild
index 7b9f42942263..b12de5921bf1 100644
--- a/app-misc/email2trac/email2trac-2.6.2.ebuild
+++ b/app-misc/email2trac/email2trac-2.8.4.ebuild
@@ -1,35 +1,35 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/email2trac/email2trac-2.6.2.ebuild,v 1.1 2012/10/01 22:51:57 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/email2trac/email2trac-2.8.4.ebuild,v 1.1 2015/01/12 21:52:41 dlan Exp $
 
-EAPI="4"
-PYTHON_DEPEND="2"
+EAPI="5"
 
-inherit python
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
 
-DESCRIPTION="Utilites to convert emails into trac objects"
-HOMEPAGE="https://subtrac.sara.nl/oss/email2trac/"
+DESCRIPTION="Utilities to convert emails to trac tickets"
+HOMEPAGE="https://oss.trac.surfsara.nl/email2trac"
 SRC_URI="ftp://ftp.sara.nl/pub/outgoing/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
 
-RDEPEND="=www-apps/trac-0.12*"
+RDEPEND="${PYTHON_DEPS}
+		<www-apps/trac-1.2[${PYTHON_USEDEP}]"
 
 pkg_setup() {
 	einfo "You can set the following variables in make.conf:"
 	einfo " - EMAIL2TRAC_TRAC_USER (default: apache)"
 	einfo " - EMAIL2TRAC_MTA_USER (default: nobody)"
 
-	python_pkg_setup
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {
 	sed -i -e "/^CFLAGS/s:=:&${CFLAGS} :" \
 		-e "s:\$(CC):& ${LDFLAGS} :" \
-		Makefile.in
+		Makefile.in || die 'sed failed'
 }
 
 src_configure() {
@@ -37,8 +37,3 @@ src_configure() {
 		--with-trac_user=${EMAIL2TRAC_TRAC_USER:-apache} \
 		--with-mta_user=${EMAIL2TRAC_MTA_USER:-nobody}
 }
-
-src_install() {
-	default
-	python_convert_shebangs -r 2 "${D}"
-}
diff --git a/app-misc/email2trac/metadata.xml b/app-misc/email2trac/metadata.xml
index 6632069b5aff..07e1e7150826 100644
--- a/app-misc/email2trac/metadata.xml
+++ b/app-misc/email2trac/metadata.xml
@@ -2,4 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>web-apps</herd>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>lukas@dzunko.sk</email>
+		<name>Lukas Dzunko</name>
+	</maintainer>
 </pkgmetadata>