net-dialup/accel-pptp: Version bump. Fix multilib issue. Drop old.

svn path=/; revision=447

5 files changed, 4 insertions, 270 deletions

diff --git a/net-dialup/accel-pptp/Manifest b/net-dialup/accel-pptp/Manifest
index 19af8cc..e5c4b2d 100644
--- a/net-dialup/accel-pptp/Manifest
+++ b/net-dialup/accel-pptp/Manifest
@@ -3,12 +3,6 @@ AUX accel-pptp-0.8.3-redudant-log-line.patch 357 RMD160 a7f4cefa2372c836ef606f16
 AUX options.pptp 341 RMD160 c55a423ee0bc8a9c349c1fe0c54847242809e915 SHA1 756529a80b02ed63a8625df8db195280447cc9a9 SHA256 fbf4859f10e5c7093b65c7edac506e240598ad53002bc5cea4569adf9ca85ce0
 AUX pptpd-confd 131 RMD160 cd7483c023adbb5d5e1aa6ed3b14114af5035790 SHA1 208d224be1e91f6e7d13b1c4cb451f92bbc55b94 SHA256 4d69da546e36439dc1a7cb5abb949ad48046155752c047babb5472decdfa1958
 AUX pptpd-init 531 RMD160 983c64cea78173ff190938e53f852e6ff4cb8ab9 SHA1 f6b83a219c44956e480f0668de7cfde44e741d2c SHA256 5e7f353a2b3812cd0e0292e5889bdbda6849e79be336d0acd5113f2fc00d38c6
-DIST accel-pptp-0.7.13.tar.bz2 497254 RMD160 6a1754fd491947054e81c765aae0bb8b6cae94f0 SHA1 b7f691d54a099c9d6869ab449be5a97960045b02 SHA256 0f38af5ca161ba4842f192328dc083aedd6dc04adce1debf20fd2e23b2623d18
-DIST accel-pptp-0.8.1.tar.bz2 488959 RMD160 56c15d0ff3149b92c716e54c15ca85ca28d05b76 SHA1 af82c35904a0fd49b3a940424de7e85e48f05799 SHA256 ef09e163709b5b738a602c8733727887f262c2b7a7d96f1efa27dbe3ef91359c
-DIST accel-pptp-0.8.2.tar.bz2 488491 RMD160 39aa64fa91c31b520f55472fe986ab9c609aa900 SHA1 fd2f1abf8c587ea5bd8dc5cc8fb150afa0cd2a4a SHA256 132641d4dcf745ac3325ae7e35aed86864dbd3007c1f02a7e15131e6ef5e093a
-DIST accel-pptp-0.8.3.tar.bz2 512438 RMD160 bd66670b31afc62fdb031759d8a8310d8b94e629 SHA1 8585986ec0aadcb84a44b0af0ba7d974f2d67207 SHA256 a97514dc3b5680dcea8091c03edf7aa5a9fb3972e4f33a228a6f6c55c4e2b65b
-EBUILD accel-pptp-0.7.13.ebuild 2135 RMD160 7c44fafe97f185f9c0a8ec36b429ee43df044778 SHA1 292204fb78004ecd1720e3e3bd6702cd85efb477 SHA256 726473bf8456fa8097113ae837d9e4d78fff4f1f898319265c1cfca5f13cc45a
-EBUILD accel-pptp-0.8.1.ebuild 2135 RMD160 7c44fafe97f185f9c0a8ec36b429ee43df044778 SHA1 292204fb78004ecd1720e3e3bd6702cd85efb477 SHA256 726473bf8456fa8097113ae837d9e4d78fff4f1f898319265c1cfca5f13cc45a
-EBUILD accel-pptp-0.8.2.ebuild 2021 RMD160 f0e77f2e48b52a692facde2581a4262b270405dc SHA1 ef906e967402ea65c40c377294b215893e3df83a SHA256 cce17724ff7b1152b4ef6609a253a4f32f734c5db5c329f49d43c1cb4c9b3114
-EBUILD accel-pptp-0.8.3.ebuild 2345 RMD160 de618aa2e05229ec6f16cf831bf29f07ad3f6c0f SHA1 4ca47be855dc04cdf9b37b2f000847ba763a6f61 SHA256 da3246c6fbbd2d0fece79d5130ddf8708c65c649fcf450f550180d40ea7077e5
+DIST accel-pptp-0.8.4.tar.bz2 493906 RMD160 f0428a3a460e3cb212fea55b7840ae580f005e53 SHA1 b275de7681baf5d1deab06672447393c3c0cd786 SHA256 2948c22dbdc7ee14f570a130c781e99c28c5521b329cae354c9d874b41c311fb
+EBUILD accel-pptp-0.8.4.ebuild 2364 RMD160 fbacba64bb018604a1cc0143c390c9e79f6ef0d5 SHA1 c2f6c033172f286efad15e30bc9cc02aeb19cd20 SHA256 414e41b3b5f6e1fd9ae6a12ed68cbb8780c1ec7ae59559b41eb362fde127344d
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
diff --git a/net-dialup/accel-pptp/accel-pptp-0.7.13.ebuild b/net-dialup/accel-pptp/accel-pptp-0.7.13.ebuild
deleted file mode 100644
index fd29d74..0000000
--- a/net-dialup/accel-pptp/accel-pptp-0.7.13.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit linux-mod eutils autotools
-
-DESCRIPTION="Point-to-Point Tunnelling Protocol Client/Server for Linux"
-SRC_URI="mirror://sourceforge/accel-pptp/${P}.tar.bz2"
-HOMEPAGE="http://accel-pptp.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="tcpd server"
-
-DEPEND="server? ( !net-dialup/pptpd )
-	>=net-dialup/ppp-2.4.2
-	>=virtual/linux-sources-2.6.15
-	tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="virtual/modutils"
-
-MODULE_NAMES="pptp(misc:${S}/kernel/driver)"
-BUILD_TARGETS="default"
-BUILD_PARAMS="KDIR=${KERNEL_DIR}"
-CONFIG_CHECK="PPP PPPOE"
-MODULESD_PPTP_EXAMPLES=("pptp min_window=5" "pptp max_window=50")
-MODULESD_PPTP_ALIASES=("net-pf-24 pptp")
-
-src_unpack() {
-	unpack ${A}
-
-	use server && cd "${S}"/pptpd-1.3.3 && eautoreconf
-	cd "${S}"/pppd_plugin && eautoreconf
-	convert_to_m "${S}"/kernel/driver/Makefile
-}
-
-src_compile() {
-	if use server; then
-		cd "${S}"/pptpd-1.3.3
-	    econf --with-bcrelay \
-			$(use_with tcpd libwrap) || die "configure failed"
-	    emake COPTS="${CFLAGS}" || die "make failed"
-	fi
-
-	cd "${S}"/pppd_plugin
-	econf || die "configure failed"
-	emake COPTS="${CFLAGS}" || die "make failed"
-
-	cd "${S}"/kernel/driver
-	linux-mod_src_compile || die "failed to build driver"
-}
-
-src_install () {
-	if use server; then
-	    cd "${S}"/pptpd-1.3.3
-	    einstall || die "make install failed"
-
-	    insinto /etc
-	    doins samples/pptpd.conf
-
-	    insinto /etc/ppp
-	    doins samples/options.pptpd
-
-	    exeinto /etc/init.d
-	    newexe "${FILESDIR}/pptpd-init" pptpd
-
-	    insinto /etc/conf.d
-	    newins "${FILESDIR}/pptpd-confd" pptpd
-	fi
-
-	cd "${S}"/pppd_plugin/src/.libs
-	local PPPD_VER=`best_version net-dialup/ppp`
-	PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-	PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-	insinto /usr/lib/pppd/${PPPD_VER}
-	newins pptp.so.0.0.0 pptp.so
-
-	cd "${S}"/kernel/driver
-	linux-mod_src_install
-
-	cd "${S}"
-	dodoc README
-	cp -R example "${D}/usr/share/doc/${P}/exmaple"
-}
-
-pkg_postinst () {
-	modules-update
-}
diff --git a/net-dialup/accel-pptp/accel-pptp-0.8.1.ebuild b/net-dialup/accel-pptp/accel-pptp-0.8.1.ebuild
deleted file mode 100644
index fd29d74..0000000
--- a/net-dialup/accel-pptp/accel-pptp-0.8.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit linux-mod eutils autotools
-
-DESCRIPTION="Point-to-Point Tunnelling Protocol Client/Server for Linux"
-SRC_URI="mirror://sourceforge/accel-pptp/${P}.tar.bz2"
-HOMEPAGE="http://accel-pptp.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="tcpd server"
-
-DEPEND="server? ( !net-dialup/pptpd )
-	>=net-dialup/ppp-2.4.2
-	>=virtual/linux-sources-2.6.15
-	tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="virtual/modutils"
-
-MODULE_NAMES="pptp(misc:${S}/kernel/driver)"
-BUILD_TARGETS="default"
-BUILD_PARAMS="KDIR=${KERNEL_DIR}"
-CONFIG_CHECK="PPP PPPOE"
-MODULESD_PPTP_EXAMPLES=("pptp min_window=5" "pptp max_window=50")
-MODULESD_PPTP_ALIASES=("net-pf-24 pptp")
-
-src_unpack() {
-	unpack ${A}
-
-	use server && cd "${S}"/pptpd-1.3.3 && eautoreconf
-	cd "${S}"/pppd_plugin && eautoreconf
-	convert_to_m "${S}"/kernel/driver/Makefile
-}
-
-src_compile() {
-	if use server; then
-		cd "${S}"/pptpd-1.3.3
-	    econf --with-bcrelay \
-			$(use_with tcpd libwrap) || die "configure failed"
-	    emake COPTS="${CFLAGS}" || die "make failed"
-	fi
-
-	cd "${S}"/pppd_plugin
-	econf || die "configure failed"
-	emake COPTS="${CFLAGS}" || die "make failed"
-
-	cd "${S}"/kernel/driver
-	linux-mod_src_compile || die "failed to build driver"
-}
-
-src_install () {
-	if use server; then
-	    cd "${S}"/pptpd-1.3.3
-	    einstall || die "make install failed"
-
-	    insinto /etc
-	    doins samples/pptpd.conf
-
-	    insinto /etc/ppp
-	    doins samples/options.pptpd
-
-	    exeinto /etc/init.d
-	    newexe "${FILESDIR}/pptpd-init" pptpd
-
-	    insinto /etc/conf.d
-	    newins "${FILESDIR}/pptpd-confd" pptpd
-	fi
-
-	cd "${S}"/pppd_plugin/src/.libs
-	local PPPD_VER=`best_version net-dialup/ppp`
-	PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-	PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-	insinto /usr/lib/pppd/${PPPD_VER}
-	newins pptp.so.0.0.0 pptp.so
-
-	cd "${S}"/kernel/driver
-	linux-mod_src_install
-
-	cd "${S}"
-	dodoc README
-	cp -R example "${D}/usr/share/doc/${P}/exmaple"
-}
-
-pkg_postinst () {
-	modules-update
-}
diff --git a/net-dialup/accel-pptp/accel-pptp-0.8.2.ebuild b/net-dialup/accel-pptp/accel-pptp-0.8.2.ebuild
deleted file mode 100644
index 1aabc64..0000000
--- a/net-dialup/accel-pptp/accel-pptp-0.8.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit linux-mod eutils autotools
-
-DESCRIPTION="Point-to-Point Tunnelling Protocol Client/Server for Linux"
-SRC_URI="mirror://sourceforge/accel-pptp/${P}.tar.bz2"
-HOMEPAGE="http://accel-pptp.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="tcpd server"
-
-DEPEND="server? ( !net-dialup/pptpd )
-	>=net-dialup/ppp-2.4.2
-	>=virtual/linux-sources-2.6.15
-	tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="virtual/modutils"
-
-MODULE_NAMES="pptp(misc:${S}/kernel/driver)"
-BUILD_TARGETS="all"
-BUILD_PARAMS="KDIR=${KERNEL_DIR}"
-CONFIG_CHECK="PPP PPPOE"
-MODULESD_PPTP_ALIASES=("net-pf-24 pptp")
-
-src_unpack() {
-	unpack ${A}
-
-	convert_to_m "${S}/kernel/driver/Makefile"
-	use server && cd "${S}/pptpd-1.3.3" && eautoreconf
-	cd "${S}/pppd_plugin" && eautoreconf
-}
-
-src_compile() {
-	if use server; then
-		cd pptpd-1.3.3
-	    econf --enable-bcrelay \
-			$(use_with tcpd libwrap)
-	    emake COPTS="${CFLAGS}" || die "make failed"
-	fi
-
-	cd "${S}"/pppd_plugin
-	econf
-	emake COPTS="${CFLAGS}" || die "make failed"
-
-	cd "${S}/kernel/driver"
-	linux-mod_src_compile || die "failed to build driver"
-}
-
-src_install () {
-	if use server; then
-	    cd "${S}"/pptpd-1.3.3
-	    einstall || die "make install failed"
-
-	    insinto /etc
-	    doins samples/pptpd.conf
-
-	    insinto /etc/ppp
-	    doins samples/options.pptpd
-
-	    exeinto /etc/init.d
-	    newexe "${FILESDIR}/pptpd-init" pptpd
-
-	    insinto /etc/conf.d
-	    newins "${FILESDIR}/pptpd-confd" pptpd
-	fi
-
-	cd "${S}"/pppd_plugin/src/.libs
-	local PPPD_VER=$(best_version net-dialup/ppp)
-	PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-	PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-	insinto /usr/lib/pppd/${PPPD_VER}
-	newins pptp.so.0.0.0 pptp.so
-	doman "${S}"/pppd_plugin/src/pppd-pptp.8 || die
-
-	cd "${S}"/kernel/driver
-	linux-mod_src_install
-
-	cd "${S}"
-	dodoc README
-	cp -R example "${D}/usr/share/doc/${P}/example"
-}
diff --git a/net-dialup/accel-pptp/accel-pptp-0.8.3.ebuild b/net-dialup/accel-pptp/accel-pptp-0.8.4.ebuild
index ef2f5a8..b1830aa 100644
--- a/net-dialup/accel-pptp/accel-pptp-0.8.3.ebuild
+++ b/net-dialup/accel-pptp/accel-pptp-0.8.4.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit linux-mod eutils autotools
+inherit linux-mod eutils autotools multilib
 
 DESCRIPTION="Point-to-Point Tunnelling Protocol Client/Server for Linux"
 SRC_URI="mirror://sourceforge/accel-pptp/${P}.tar.bz2"
@@ -84,7 +84,7 @@ src_install () {
 	local PPPD_VER=$(best_version net-dialup/ppp)
 	PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
 	PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-	insinto /usr/lib/pppd/${PPPD_VER}
+	insinto /usr/$(get_libdir)/pppd/${PPPD_VER}
 	newins pptp.so.0.0.0 pptp.so || die
 	doman "${S}"/pppd_plugin/src/pppd-pptp.8 || die