Attachment #96583 for bug #147058

View | Details | Raw Unified | Return to bug 147058
Collapse All | Expand All




	die "No GD support found for PHP"
}

# Require a PHP built with imagemagick wrapper support

require_imagick() {
	has_php
	if built_with_use =${PHP_PKG} imagemagick ; then
		return
	fi

	# If we get here, then we don't have any Imagemagick support for PHP installed
	eerror
	eerror "No ImageMagick extension for PHP found."
	eerror "Please install an Imagemagick extension for PHP,"
	eerror "this is done best by simply adding the"
	eerror "'imagemagick' USE flag when emerging dev-lang/php."
	eerror
	die "No ImageMagick extension for PHP found"
}


# ========================================================================
# Misc functions
#

Lines 38-44 Link Here

(-)php4_4-sapi.eclass.old (-1 / +2 lines)
38	S="${WORKDIR}/${MY_PHP_P}"	38	S="${WORKDIR}/${MY_PHP_P}"
39	fi	39	fi
40		40
41	IUSE="adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl db2 dbase dbmaker dbx debug doc empress empress-bcs esoob exif expat frontbase fdftk filepro firebird flatfile ftp gd gd-external gdbm gmp hardenedphp hyperwave-api iconv imap informix inifile interbase iodbc ipv6 java-internal java-external kerberos ldap libedit mcal mcve memlimit mhash ming mnogosearch msql mssql mysql ncurses nls oci8 oci8-instant-client odbc oracle7 overload ovrimos pcntl pcre pfpro pic posix postgres readline recode sapdb session sharedext sharedmem snmp sockets solid spell sqlite ssl sybase sybase-ct sysvipc tokenizer truetype unicode wddx xml xmlrpc xpm xsl yaz zip zlib"	41	IUSE="adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl db2 dbase dbmaker dbx debug doc empress empress-bcs esoob exif expat frontbase fdftk filepro firebird flatfile ftp gd gd-external gdbm gmp hardenedphp hyperwave-api iconv imagemagick imap informix inifile interbase iodbc ipv6 java-internal java-external kerberos ldap libedit mcal mcve memlimit mhash ming mnogosearch msql mssql mysql ncurses nls oci8 oci8-instant-client odbc oracle7 overload ovrimos pcntl pcre pfpro pic posix postgres readline recode sapdb session sharedext sharedmem snmp sockets solid spell sqlite ssl sybase sybase-ct sysvipc tokenizer truetype unicode wddx xml xmlrpc xpm xsl yaz zip zlib"
42		42
43	# these USE flags should have the correct dependencies	43	# these USE flags should have the correct dependencies
44	DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 )	44	DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 )
Lines 121-126 Link Here
121	#	121	#
122	# They are in PDEPEND because we need PHP installed first!	122	# They are in PDEPEND because we need PHP installed first!
123	PDEPEND="doc? ( app-doc/php-docs )	123	PDEPEND="doc? ( app-doc/php-docs )
		124	imagemagick? ( dev-php4/pecl-imagick )
124	java-external? ( dev-php4/php-java-bridge )	125	java-external? ( dev-php4/php-java-bridge )
125	sqlite? ( dev-php4/pecl-sqlite )	126	sqlite? ( dev-php4/pecl-sqlite )
126	yaz? ( dev-php4/pecl-yaz )	127	yaz? ( dev-php4/pecl-yaz )

Lines 38-44 Link Here

(-)php5_0-sapi.eclass.old (-1 / +2 lines)
38	S="${WORKDIR}/${MY_PHP_P}"	38	S="${WORKDIR}/${MY_PHP_P}"
39	fi	39	fi
40		40
41	IUSE="adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl curlwrappers db2 dbase dbmaker debug doc empress empress-bcs esoob exif frontbase fdftk filepro firebird flatfile ftp gd gd-external gdbm gmp hardenedphp hyperwave-api iconv imap informix inifile interbase iodbc ipv6 java-external kerberos ldap libedit mcve memlimit mhash ming mnogosearch msql mssql mysql mysqli ncurses nls oci8 oci8-instant-client odbc oracle7 ovrimos pcntl pcre pdo-external pfpro pic posix postgres qdbm readline recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc tidy tokenizer truetype unicode wddx xml xmlrpc xpm xsl yaz zip zlib"	41	IUSE="adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl curlwrappers db2 dbase dbmaker debug doc empress empress-bcs esoob exif frontbase fdftk filepro firebird flatfile ftp gd gd-external gdbm gmp hardenedphp hyperwave-api iconv imagemagick imap informix inifile interbase iodbc ipv6 java-external kerberos ldap libedit mcve memlimit mhash ming mnogosearch msql mssql mysql mysqli ncurses nls oci8 oci8-instant-client odbc oracle7 ovrimos pcntl pcre pdo-external pfpro pic posix postgres qdbm readline recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc tidy tokenizer truetype unicode wddx xml xmlrpc xpm xsl yaz zip zlib"
42		42
43	# these USE flags should have the correct dependencies	43	# these USE flags should have the correct dependencies
44	DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 )	44	DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 )
Lines 123-128 Link Here
123	#	123	#
124	# They are in PDEPEND because we need PHP installed first!	124	# They are in PDEPEND because we need PHP installed first!
125	PDEPEND="doc? ( app-doc/php-docs )	125	PDEPEND="doc? ( app-doc/php-docs )
		126	imagemagick? ( dev-php5/pecl-imagick )
126	java-external? ( dev-php5/php-java-bridge )	127	java-external? ( dev-php5/php-java-bridge )
127	mcve? ( dev-php5/pecl-mcve )	128	mcve? ( dev-php5/pecl-mcve )
128	pdo-external? ( dev-php5/pecl-pdo )	129	pdo-external? ( dev-php5/pecl-pdo )

Lines 38-44 Link Here

(-)php5_1-sapi.eclass.old (-1 / +2 lines)
38	S="${WORKDIR}/${MY_PHP_P}"	38	S="${WORKDIR}/${MY_PHP_P}"
39	fi	39	fi
40		40
41	IUSE="adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl curlwrappers db2 dbase dbmaker debug doc empress empress-bcs esoob exif frontbase fdftk filepro firebird flatfile ftp gd gd-external gdbm gmp hardenedphp hash hyperwave-api iconv imap informix inifile interbase iodbc ipv6 java-external kerberos ldap libedit mcve memlimit mhash ming msql mssql mysql mysqli ncurses nls oci8 oci8-instant-client odbc pcntl pcre pdo pdo-external pic posix postgres qdbm readline reflection recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc tidy tokenizer truetype unicode vm-goto vm-switch wddx xml xmlreader xmlwriter xmlrpc xpm xsl yaz zip zlib"	41	IUSE="adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl curlwrappers db2 dbase dbmaker debug doc empress empress-bcs esoob exif frontbase fdftk filepro firebird flatfile ftp gd gd-external gdbm gmp hardenedphp hash hyperwave-api iconv imagemagick imap informix inifile interbase iodbc ipv6 java-external kerberos ldap libedit mcve memlimit mhash ming msql mssql mysql mysqli ncurses nls oci8 oci8-instant-client odbc pcntl pcre pdo pdo-external pic posix postgres qdbm readline reflection recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc tidy tokenizer truetype unicode vm-goto vm-switch wddx xml xmlreader xmlwriter xmlrpc xpm xsl yaz zip zlib"
42		42
43	# these USE flags should have the correct dependencies	43	# these USE flags should have the correct dependencies
44	DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 )	44	DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 )
Lines 125-130 Link Here
125	#	125	#
126	# They are in PDEPEND because we need PHP installed first!	126	# They are in PDEPEND because we need PHP installed first!
127	PDEPEND="doc? ( app-doc/php-docs )	127	PDEPEND="doc? ( app-doc/php-docs )
		128	imagemagick? ( dev-php5/pecl-imagick )
128	java-external? ( dev-php5/php-java-bridge )	129	java-external? ( dev-php5/php-java-bridge )
129	mcve? ( dev-php5/pecl-mcve )	130	mcve? ( dev-php5/pecl-mcve )
130	pdo-external? ( dev-php5/pecl-pdo )	131	pdo-external? ( dev-php5/pecl-pdo )

Return to bug 147058

Lines 506-511 Link Here

(-)depend.php.eclass.old (+19 lines)
506	die "No GD support found for PHP"	506	die "No GD support found for PHP"
507	}	507	}
508		508
		509	# Require a PHP built with imagemagick wrapper support
		510
		511	require_imagick() {
		512	has_php
		513	if built_with_use =${PHP_PKG} imagemagick ; then
		514	return
		515	fi
		516
		517	# If we get here, then we don't have any Imagemagick support for PHP installed
		518	eerror
		519	eerror "No ImageMagick extension for PHP found."
		520	eerror "Please install an Imagemagick extension for PHP,"
		521	eerror "this is done best by simply adding the"
		522	eerror "'imagemagick' USE flag when emerging dev-lang/php."
		523	eerror
		524	die "No ImageMagick extension for PHP found"
		525	}
		526
		527
509	# ========================================================================	528	# ========================================================================
510	# Misc functions	529	# Misc functions
511	#	530	#