Attachment #293141 for bug #315855




# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.5.2-r1.ebuild,v 1.3 2011/08/06 03:51:55 jer Exp $

EAPI="4"
PYTHON_DEPEND="python? 2"
inherit autotools multilib ssl-cert python

DESCRIPTION="The Internet News daemon, fully featured NNTP server"
HOMEPAGE="https://www.isc.org/software/inn"

	kerberos? ( virtual/krb5 )
	sasl? ( >=dev-libs/cyrus-sasl-2 )
	ssl? ( dev-libs/openssl )
	python? ( dev-lang/python )
	berkdb? ( sys-libs/db )
	"
RDEPEND="${DEPEND}"

pkg_setup() {
	if use python; then
		python_set_active_version 2
	fi
}

src_prepare() {
	sed -i -e "s: -B .OLD::" Makefile.global.in || die


		$(use_enable ipv6) \
		$(use_enable !inntaggedhash largefiles) \
		$(use_enable inntaggedhash tagged-hash) \
		$(use_enable innkeywords keywords) 
		|| die "econf failed"
}

src_install() {
	emake DESTDIR="${ED}/" P="" SPECIAL="" install

	chown -R root:0 \
		"${ED}"/usr/$(get_libdir)/news/$(get_libdir) \
		"${ED}"/usr/$(get_libdir)/news/include \
		"${ED}"/usr/share/doc \
		"${ED}"/usr/share/man \
		|| die
	chmod 644 "${ED}"/etc/news/* || die
	chmod 640 \
		"${ED}"/etc/news/control.ctl \
		"${ED}"/etc/news/expire.ctl \
		"${ED}"/etc/news/incoming.conf \
		"${ED}"/etc/news/nntpsend.ctl \
		"${ED}"/etc/news/passwd.nntp \
		"${ED}"/etc/news/readers.conf \
		|| die

	# Prevent old db/* files from being overwritten

Lines 3-9 Link Here

(-)inn.orig/inn-2.5.2.ebuild (-6 / +14 lines)
3	# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.5.2.ebuild,v 1.5 2011/06/22 21:22:01 ranger Exp $	3	# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.5.2.ebuild,v 1.5 2011/06/22 21:22:01 ranger Exp $
4		4
5	EAPI="3"	5	EAPI="3"
6	inherit autotools eutils fixheadtails multilib ssl-cert	6	PYTHON_DEPEND="python? 2"
		7	inherit autotools eutils fixheadtails multilib ssl-cert python
7		8
8	DESCRIPTION="The Internet News daemon, fully featured NNTP server"	9	DESCRIPTION="The Internet News daemon, fully featured NNTP server"
9	HOMEPAGE="https://www.isc.org/software/inn"	10	HOMEPAGE="https://www.isc.org/software/inn"
Lines 21-29 Link Here
21	sasl? ( >=dev-libs/cyrus-sasl-2 )	22	sasl? ( >=dev-libs/cyrus-sasl-2 )
22	ssl? ( dev-libs/openssl )	23	ssl? ( dev-libs/openssl )
23	berkdb? ( sys-libs/db )	24	berkdb? ( sys-libs/db )
24	"	25	"
25	DEPEND="${RDEPEND}"	26	DEPEND="${RDEPEND}"
26		27
		28	pkg_setup() {
		29	if use python; then
		30	python_set_active_version 2
		31	python_pkg_setup
		32	fi
		33	}
		34
27	src_prepare() {	35	src_prepare() {
28	#ht_fix_file configure.in support/fixscript.in	36	#ht_fix_file configure.in support/fixscript.in
29	sed -i -e "s/ -B .OLD//" Makefile.global.in \|\| die "sed failed"	37	sed -i -e "s/ -B .OLD//" Makefile.global.in \|\| die "sed failed"
Lines 71-83 Link Here
71	}	79	}
72		80
73	src_install() {	81	src_install() {
74	emake DESTDIR="${D}/" P="" SPECIAL="" install \|\| die "make install failed"	82	emake DESTDIR="${ED}/" P="" SPECIAL="" install \|\| die "make install failed"
75		83
76	chown -R root:0 "${D}"/usr/{$(get_libdir)/news/{lib,include},share/{doc,man}}	84	chown -R root:0 "${ED}"/usr/{$(get_libdir)/news/{lib,include},share/{doc,man}}
77	chmod 644 "${D}"/etc/news/*	85	chmod 644 "${ED}"/etc/news/*
78	for file in control.ctl expire.ctl incoming.conf nntpsend.ctl passwd.nntp readers.conf	86	for file in control.ctl expire.ctl incoming.conf nntpsend.ctl passwd.nntp readers.conf
79	do	87	do
80	chmod 640 "${D}"/etc/news/${file}	88	chmod 640 "${ED}"/etc/news/${file}
81	done	89	done
82		90
83	# Prevent old db/* files from being overwritten	91	# Prevent old db/* files from being overwritten

Return to bug 315855

Lines 3-10 Link Here

(-)inn.orig/inn-2.5.2-r1.ebuild (-18 / +22 lines)
3	# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.5.2-r1.ebuild,v 1.3 2011/08/06 03:51:55 jer Exp $	3	# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.5.2-r1.ebuild,v 1.3 2011/08/06 03:51:55 jer Exp $
4		4
5	EAPI="4"	5	EAPI="4"
6		6	PYTHON_DEPEND="python? 2"
7	inherit autotools multilib ssl-cert	7	inherit autotools multilib ssl-cert python
8		8
9	DESCRIPTION="The Internet News daemon, fully featured NNTP server"	9	DESCRIPTION="The Internet News daemon, fully featured NNTP server"
10	HOMEPAGE="https://www.isc.org/software/inn"	10	HOMEPAGE="https://www.isc.org/software/inn"
Lines 21-31 Link Here
21	kerberos? ( virtual/krb5 )	21	kerberos? ( virtual/krb5 )
22	sasl? ( >=dev-libs/cyrus-sasl-2 )	22	sasl? ( >=dev-libs/cyrus-sasl-2 )
23	ssl? ( dev-libs/openssl )	23	ssl? ( dev-libs/openssl )
24	python? ( dev-lang/python )
25	berkdb? ( sys-libs/db )	24	berkdb? ( sys-libs/db )
26	"	25	"
27	RDEPEND="${DEPEND}"	26	RDEPEND="${DEPEND}"
28		27
		28	pkg_setup() {
		29	if use python; then
		30	python_set_active_version 2
		31	fi
		32	}
		33
29	src_prepare() {	34	src_prepare() {
30	sed -i -e "s: -B .OLD::" Makefile.global.in \|\| die	35	sed -i -e "s: -B .OLD::" Makefile.global.in \|\| die
31		36
Lines 67-93 Link Here
67	$(use_enable ipv6) \	72	$(use_enable ipv6) \
68	$(use_enable !inntaggedhash largefiles) \	73	$(use_enable !inntaggedhash largefiles) \
69	$(use_enable inntaggedhash tagged-hash) \	74	$(use_enable inntaggedhash tagged-hash) \
70	$(use_enable innkeywords keywords) \	75	$(use_enable innkeywords keywords)
71	\|\| die "econf failed"
72	}	76	}
73		77
74	src_install() {	78	src_install() {
75	emake DESTDIR="${D}/" P="" SPECIAL="" install	79	emake DESTDIR="${ED}/" P="" SPECIAL="" install
76		80
77	chown -R root:0 \	81	chown -R root:0 \
78	"${D}"/usr/$(get_libdir)/news/$(get_libdir) \	82	"${ED}"/usr/$(get_libdir)/news/$(get_libdir) \
79	"${D}"/usr/$(get_libdir)/news/include \	83	"${ED}"/usr/$(get_libdir)/news/include \
80	"${D}"/usr/share/doc \	84	"${ED}"/usr/share/doc \
81	"${D}"/usr/share/man \	85	"${ED}"/usr/share/man \
82	\|\| die	86	\|\| die
83	chmod 644 "${D}"/etc/news/* \|\| die	87	chmod 644 "${ED}"/etc/news/* \|\| die
84	chmod 640 \	88	chmod 640 \
85	"${D}"/etc/news/control.ctl \	89	"${ED}"/etc/news/control.ctl \
86	"${D}"/etc/news/expire.ctl \	90	"${ED}"/etc/news/expire.ctl \
87	"${D}"/etc/news/incoming.conf \	91	"${ED}"/etc/news/incoming.conf \
88	"${D}"/etc/news/nntpsend.ctl \	92	"${ED}"/etc/news/nntpsend.ctl \
89	"${D}"/etc/news/passwd.nntp \	93	"${ED}"/etc/news/passwd.nntp \
90	"${D}"/etc/news/readers.conf \	94	"${ED}"/etc/news/readers.conf \
91	\|\| die	95	\|\| die
92		96
93	# Prevent old db/* files from being overwritten	97	# Prevent old db/* files from being overwritten